diff --git a/CMakeLists.txt b/CMakeLists.txt index c7637be27f..3993d76754 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version") set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location") +set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location") configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in index 32a67b8baa..ce2264f5fc 100644 --- a/cura/CuraVersion.py.in +++ b/cura/CuraVersion.py.in @@ -9,4 +9,5 @@ CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@" CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@" CuraCloudAccountAPIRoot = "@CURA_CLOUD_ACCOUNT_API_ROOT@" -CuraMarketplaceRoot = "@CURA_MARKETPLACE_ROOT@" \ No newline at end of file +CuraMarketplaceRoot = "@CURA_MARKETPLACE_ROOT@" +CuraDigitalFactoryURL = "@CURA_DIGITAL_FACTORY_URL@" diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index c5d46f9a79..2527d761bd 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -5,7 +5,7 @@ import os import re import configparser -from typing import Any, cast, Dict, Optional, List, Union +from typing import Any, cast, Dict, Optional, List, Union, Tuple from PyQt5.QtWidgets import QMessageBox from UM.Decorators import override @@ -179,7 +179,7 @@ class CuraContainerRegistry(ContainerRegistry): """Imports a profile from a file :param file_name: The full path and filename of the profile to import. - :return: Dict with a 'status' key containing the string 'ok' or 'error', + :return: Dict with a 'status' key containing the string 'ok', 'warning' or 'error', and a 'message' key containing a message for the user. """ @@ -305,6 +305,7 @@ class CuraContainerRegistry(ContainerRegistry): # Import all profiles profile_ids_added = [] # type: List[str] + additional_message = None for profile_index, profile in enumerate(profile_or_list): if profile_index == 0: # This is assumed to be the global profile @@ -323,18 +324,26 @@ class CuraContainerRegistry(ContainerRegistry): else: # More extruders in the imported file than in the machine. continue # Delete the additional profiles. - result = self._configureProfile(profile, profile_id, new_name, expected_machine_definition) - if result is not None: - # Remove any profiles that did got added. - for profile_id in profile_ids_added: + configuration_successful, message = self._configureProfile(profile, profile_id, new_name, expected_machine_definition) + if configuration_successful: + additional_message = message + else: + # Remove any profiles that were added. + for profile_id in profile_ids_added + [profile.getId()]: self.removeContainer(profile_id) - + if not message: + message = "" return {"status": "error", "message": catalog.i18nc( - "@info:status Don't translate the XML tag !", - "Failed to import profile from {0}:", - file_name) + " " + result} + "@info:status Don't translate the XML tag !", + "Failed to import profile from {0}:", + file_name) + " " + message} profile_ids_added.append(profile.getId()) - return {"status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile_or_list[0].getName())} + result_status = "ok" + success_message = catalog.i18nc("@info:status", "Successfully imported profile {0}.", profile_or_list[0].getName()) + if additional_message: + result_status = "warning" + success_message += additional_message + return {"status": result_status, "message": success_message} # This message is throw when the profile reader doesn't find any profile in the file return {"status": "error", "message": catalog.i18nc("@info:status", "File {0} does not contain any valid profile.", file_name)} @@ -395,14 +404,18 @@ class CuraContainerRegistry(ContainerRegistry): return False return True - def _configureProfile(self, profile: InstanceContainer, id_seed: str, new_name: str, machine_definition_id: str) -> Optional[str]: + def _configureProfile(self, profile: InstanceContainer, id_seed: str, new_name: str, machine_definition_id: str) -> Tuple[bool, Optional[str]]: """Update an imported profile to match the current machine configuration. :param profile: The profile to configure. :param id_seed: The base ID for the profile. May be changed so it does not conflict with existing containers. :param new_name: The new name for the profile. - :return: None if configuring was successful or an error message if an error occurred. + :returns: tuple (configuration_successful, message) + WHERE + bool configuration_successful: Whether the process of configuring the profile was successful + optional str message: A message indicating the outcome of configuring the profile. If the configuration + is successful, this message can be None or contain a warning """ profile.setDirty(True) # Ensure the profiles are correctly saved @@ -423,26 +436,39 @@ class CuraContainerRegistry(ContainerRegistry): quality_type = profile.getMetaDataEntry("quality_type") if not quality_type: - return catalog.i18nc("@info:status", "Profile is missing a quality type.") + return False, catalog.i18nc("@info:status", "Profile is missing a quality type.") global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() - if global_stack is None: - return None + if not global_stack: + return False, catalog.i18nc("@info:status", "Global stack is missing.") + definition_id = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition profile.setDefinition(definition_id) + if not self.addContainer(profile): + return False, catalog.i18nc("@info:status", "Unable to add the profile.") + + # "not_supported" profiles can be imported. + if quality_type == empty_quality_container.getMetaDataEntry("quality_type"): + return True, None + # Check to make sure the imported profile actually makes sense in context of the current configuration. # This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as # successfully imported but then fail to show up. - quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() - # "not_supported" profiles can be imported. - if quality_type != empty_quality_container.getMetaDataEntry("quality_type") and quality_type not in quality_group_dict: - return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type) + available_quality_groups_dict = {name: quality_group for name, quality_group in ContainerTree.getInstance().getCurrentQualityGroups().items() if quality_group.is_available} + all_quality_groups_dict = ContainerTree.getInstance().getCurrentQualityGroups() - if not self.addContainer(profile): - return catalog.i18nc("@info:status", "Unable to add the profile.") + # If the quality type doesn't exist at all in the quality_groups of this machine, reject the profile + if quality_type not in all_quality_groups_dict: + return False, catalog.i18nc("@info:status", "Quality type '{0}' is not compatible with the current active machine definition '{1}'.", quality_type, definition_id) - return None + # If the quality_type exists in the quality_groups of this printer but it is not available with the current + # machine configuration (e.g. not available for the selected nozzles), accept it with a warning + if quality_type not in available_quality_groups_dict: + return True, "\n\n" + catalog.i18nc("@info:status", "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. " + "Switch to a material/nozzle combination that can use this quality type.", quality_type) + + return True, None @override(ContainerRegistry) def saveDirtyContainers(self) -> None: diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 4b0308a861..68d659a108 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -369,7 +369,8 @@ class MachineManager(QObject): material_node = variant_node.materials.get(extruder.material.getMetaDataEntry("base_file")) if material_node is None: Logger.log("w", "An extruder has an unknown material, switching it to the preferred material") - self.setMaterialById(extruder.getMetaDataEntry("position"), machine_node.preferred_material) + if not self.setMaterialById(extruder.getMetaDataEntry("position"), machine_node.preferred_material): + Logger.log("w", "Failed to switch to %s keeping old material instead", machine_node.preferred_material) @staticmethod @@ -1452,17 +1453,21 @@ class MachineManager(QObject): self.updateMaterialWithVariant(None) # Update all materials self._updateQualityWithMaterial() - @pyqtSlot(str, str) - def setMaterialById(self, position: str, root_material_id: str) -> None: + @pyqtSlot(str, str, result = bool) + def setMaterialById(self, position: str, root_material_id: str) -> bool: if self._global_container_stack is None: - return + return False machine_definition_id = self._global_container_stack.definition.id position = str(position) extruder_stack = self._global_container_stack.extruderList[int(position)] nozzle_name = extruder_stack.variant.getName() - material_node = ContainerTree.getInstance().machines[machine_definition_id].variants[nozzle_name].materials[root_material_id] - self.setMaterial(position, material_node) + + materials = ContainerTree.getInstance().machines[machine_definition_id].variants[nozzle_name].materials + if root_material_id in materials: + self.setMaterial(position, materials[root_material_id]) + return True + return False @pyqtSlot(str, "QVariant") def setMaterial(self, position: str, container_node, global_stack: Optional["GlobalStack"] = None) -> None: diff --git a/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py b/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py index 3c80565fa1..5a3e2474a8 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py @@ -108,7 +108,11 @@ class ToolPathUploader: Logger.log("i", "Finished callback %s %s", reply.attribute(QNetworkRequest.HttpStatusCodeAttribute), reply.url().toString()) - status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) # type: int + status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) # type: Optional[int] + if not status_code: + Logger.log("e", "Reply contained no status code.") + self._errorCallback(reply, None) + return # check if we should retry the last chunk if self._retries < self.MAX_RETRIES and status_code in self.RETRY_HTTP_CODES: diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index f8d344839c..30694b074b 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -88,8 +88,12 @@ class USBPrinterOutputDevice(PrinterOutputDevice): self._firmware_name_requested = False self._firmware_updater = AvrFirmwareUpdater(self) - plugin_path = cast(str, PluginRegistry.getInstance().getPluginPath("USBPrinting")) - self._monitor_view_qml_path = os.path.join(plugin_path, "MonitorItem.qml") + plugin_path = PluginRegistry.getInstance().getPluginPath("USBPrinting") + if plugin_path: + self._monitor_view_qml_path = os.path.join(plugin_path, "MonitorItem.qml") + else: + Logger.log("e", "Cannot create Monitor QML view: cannot find plugin path for plugin [USBPrinting]") + self._monitor_view_qml_path = "" CuraApplication.getInstance().getOnExitCallbackManager().addCallback(self._checkActivePrintingUponAppExit) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 6fe4d4242b..70e702d0bf 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1112,7 +1112,6 @@ class XmlMaterialProfile(InstanceContainer): "retraction speed": "retraction_speed", "adhesion tendency": "material_adhesion_tendency", "surface energy": "material_surface_energy", - "shrinkage percentage": "material_shrinkage_percentage", "build volume temperature": "build_volume_temperature", "anti ooze retract position": "material_anti_ooze_retracted_position", "anti ooze retract speed": "material_anti_ooze_retraction_speed", diff --git a/resources/definitions/biqu_b1.def.json b/resources/definitions/biqu_b1.def.json new file mode 100755 index 0000000000..2320f22eca --- /dev/null +++ b/resources/definitions/biqu_b1.def.json @@ -0,0 +1,57 @@ +{ + "name": "BIQU B1", + "version": 2, + "inherits": "biqu_base", + "metadata": { + "quality_definition": "biqu_base", + "visible": true, + "has_machine_materials": true, + "platform": "BIQU_SSS.stl", + "platform_offset": [ + 0, + -7.4, + 5 + ] + }, + "overrides": { + "coasting_enable": { "default_value": true }, + "coasting_enable": { "value": true }, + "retraction_amount": { "default_value": 7 }, + "retraction_amount": { "value": 7 }, + "retraction_speed": { "default_value": 70 }, + "retraction_speed": { "value": 70 }, + "support_enable": { "default_value": true }, + "support_enable": { "value": true }, + "support_structure": { "default_value": "normal" }, + "support_structure": { "value": "normal" }, + "support_type": { "default_value": "buildplate" }, + "support_type": { "value": "buildplate" }, + "support_angle": { "default_value": 45 }, + "support_angle": { "value": 45 }, + "support_infill_rate": { "default_value": 15 }, + "support_infill_rate": { "value": 15 }, + "infill_overlap_mm": { "default_value": 0.06 }, + "infill_overlap_mm": { "value": 0.06 }, + "speed_print": { "default_value": 60 }, + "speed_print": { "value": 60 }, + "machine_name": { "default_value": "BIQU B1" }, + "machine_width": { "default_value": 235 }, + "machine_width": { "value": 235 }, + "machine_depth": { "default_value": 235 }, + "machine_depth": { "value": 235 }, + "machine_height": { "default_value": 270 }, + "machine_height": { "value": 270 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-33, 35], + [-33, -23], + [33, -23], + [33, 35] + ] + }, + "machine_start_gcode": { + "default_value": " ; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG92 E0 ; Reset Extruder\nM117 Homing axes\nG28 ; Home all axes\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 27.5 } + } +} diff --git a/resources/definitions/biqu_b1_abl.def.json b/resources/definitions/biqu_b1_abl.def.json new file mode 100755 index 0000000000..25d555d3e6 --- /dev/null +++ b/resources/definitions/biqu_b1_abl.def.json @@ -0,0 +1,57 @@ +{ + "name": "BIQU B1 ABL", + "version": 2, + "inherits": "biqu_base", + "metadata": { + "quality_definition": "biqu_base", + "visible": true, + "has_machine_materials": true, + "platform": "BIQU_SSS.stl", + "platform_offset": [ + 0, + -7.4, + 5 + ] + }, + "overrides": { + "coasting_enable": { "default_value": true }, + "coasting_enable": { "value": true }, + "retraction_amount": { "default_value": 7 }, + "retraction_amount": { "value": 7 }, + "retraction_speed": { "default_value": 70 }, + "retraction_speed": { "value": 70 }, + "support_enable": { "default_value": true }, + "support_enable": { "value": true }, + "support_structure": { "default_value": "normal" }, + "support_structure": { "value": "normal" }, + "support_type": { "default_value": "buildplate" }, + "support_type": { "value": "buildplate" }, + "support_angle": { "default_value": 45 }, + "support_angle": { "value": 45 }, + "support_infill_rate": { "default_value": 15 }, + "support_infill_rate": { "value": 15 }, + "infill_overlap_mm": { "default_value": 0.06 }, + "infill_overlap_mm": { "value": 0.06 }, + "speed_print": { "default_value": 60 }, + "speed_print": { "value": 60 }, + "machine_name": { "default_value": "BIQU B1 ABL" }, + "machine_width": { "default_value": 235 }, + "machine_width": { "value": 235 }, + "machine_depth": { "default_value": 235 }, + "machine_depth": { "value": 235 }, + "machine_height": { "default_value": 270 }, + "machine_height": { "value": 270 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-33, 35], + [-33, -23], + [33, -23], + [33, 35] + ] + }, + "machine_start_gcode": { + "default_value": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM117 Pre-heating the extruder\nM104 S160 ; Set Extruder temperature\nM117 Homing axes\nG28 ; Home all axes\nM117 ABL Probing\nG29\nM117 Getting the extruder up to temp\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 27.5 } + } +} diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json new file mode 100755 index 0000000000..502b2c1f3a --- /dev/null +++ b/resources/definitions/biqu_base.def.json @@ -0,0 +1,169 @@ +{ + "name": "Biqu Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Luke Harrison", + "manufacturer": "BIQU", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "biqu_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Diameter", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla_175" + }, + "overrides": { + "machine_name": { "default_value": "BIQU Base Printer" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, + "machine_end_gcode": { "default_value": " ;BIQU Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positionning\n\nG1 X0 Y{machine_depth} ;TaDaaaa\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\n" }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 75 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, + + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + + "infill_line_width": { "default_value": "line_width * 1.2" }, + "infill_line_width": { "value": "line_width * 1.2" }, + "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_tree_enable else 20" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/blv_mgn_cube_300.def.json b/resources/definitions/blv_mgn_cube_300.def.json new file mode 100644 index 0000000000..4754bb962d --- /dev/null +++ b/resources/definitions/blv_mgn_cube_300.def.json @@ -0,0 +1,34 @@ +{ + "name": "BLV mgn Cube 300", + "version": 2, + "inherits": "blv_mgn_cube_base", + "metadata": { + "visible": true, + "setting_version": 16, + "author": "wolfgangmauer", + "manufacturer": "BLV", + "file_formats": "text/x-gcode", + "first_start_actions": [ + "MachineSettingsAction" + ], + "machine_extruder_trains": { + "0": "blv_mgn_cube_extruder_0" + }, + "quality_definition": "blv_mgn_cube_base", + "platform": "blv_mgn_cube_300_platform.3mf" + }, + "overrides": { + "machine_name": { + "default_value": "BLV mgn Cube 300" + }, + "machine_height": { + "default_value": 465 + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + } + } +} diff --git a/resources/definitions/blv_mgn_cube_350.def.json b/resources/definitions/blv_mgn_cube_350.def.json new file mode 100644 index 0000000000..1c8a894af0 --- /dev/null +++ b/resources/definitions/blv_mgn_cube_350.def.json @@ -0,0 +1,34 @@ +{ + "name": "BLV mgn Cube 350", + "version": 2, + "inherits": "blv_mgn_cube_base", + "metadata": { + "visible": true, + "setting_version": 16, + "author": "wolfgangmauer", + "manufacturer": "BLV", + "file_formats": "text/x-gcode", + "first_start_actions": [ + "MachineSettingsAction" + ], + "machine_extruder_trains": { + "0": "blv_mgn_cube_extruder_0" + }, + "quality_definition": "blv_mgn_cube_base", + "platform": "blv_mgn_cube_350_platform.3mf" + }, + "overrides": { + "machine_name": { + "default_value": "BLV mgn Cube350" + }, + "machine_height": { + "default_value": 465 + }, + "machine_width": { + "default_value": 350 + }, + "machine_depth": { + "default_value": 350 + } + } +} diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json new file mode 100644 index 0000000000..47b7d12f97 --- /dev/null +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -0,0 +1,216 @@ +{ + "name": "BLV mgn Cube Base", + "version": 2, + "inherits": "anet3d", + "metadata": { + "visible": false, + "author": "wolfgangmauer", + "manufacturer": "BLV", + "file_formats": "text/x-gcode", + "first_start_actions": [ + "MachineSettingsAction" + ], + "preferred_quality_type": "normal", + "machine_extruder_trains": { + "0": "blv_mgn_cube_extruder_0" + }, + "preferred_material": "generic_pla", + "has_variants": false, + "has_materials": true, + "preferred_variant_name": "0.4mm Nozzle", + "has_machine_quality": false + }, + "overrides": { + "machine_name": { + "default_value": "BLV mgn Cube" + }, + "initial_layer_line_width_factor": { + "default_value": 130.0 + }, + "speed_slowdown_layers": { + "default_value": 1 + }, + "optimize_wall_printing_order": { + "value": true + }, + "infill_enable_travel_optimization": { + "default_value": true + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (RepRap)" + }, + "fill_perimeter_gaps": { + "value": "'everywhere'" + }, + "fill_outline_gaps": { + "value": true + }, + "retraction_speed": { + "default_value": 85, + "maximum_value_warning": 130 + }, + "retraction_amount": { + "default_value": 5.5 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_combing": { + "value": "'infill'" + }, + "retraction_combing_max_distance": { + "value": 10 + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG92 E0 ;zero the extruded length\nM104 S170 T0; start preheat hotend_0\nM140 S{material_bed_temperature_layer_0} ; start preheating the bed\nM190 S{material_bed_temperature_layer_0} ; heat to Cura Bed setting\nG28\nG12 P1 S2 T3\nG34\nG29\nG1 X0 Y0 Z1 F9000\nM109 S{material_print_temperature_layer_0} T0\nG1 X100 Y0 Z{layer_height_0} E30 F500 ;intro line\nG92 E0 ;zero the extruded length again\nM117 Printing...\n" + }, + "machine_end_gcode": { + "default_value": "G91 ;relative positioning\nG1 Z5 F500; move nozzle relative to position\nG90 ;absolute positioning\nG1 X0 Y{machine_depth}\nG12 P1 T3\nM104 S0\nM140 S0\nG92 E0\nM84\nM109 S50\nM81\n" + }, + "top_bottom_pattern": { + "value": "'zigzag'" + }, + "speed_layer_0": { + "value": "math.ceil(speed_print * 0.25)" + }, + "adhesion_type": { + "value": "'none'" + }, + "speed_travel": { + "value": 120, + "maximum_value_warning": 251, + "maximum_value": 300 + }, + "infill_pattern": { + "value": "'tetrahedral'" + }, + "bridge_settings_enabled": { + "default_value": true + }, + "layer_height_0": { + "resolve": "max(0.2, min(extruderValues('layer_height')))" + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "wall_line_width": { + "value": "machine_nozzle_size" + }, + "infill_before_walls": { + "value": true + }, + "zig_zaggify_infill": { + "value": true + }, + "acceleration_enabled": { + "value": false + }, + "jerk_enabled": { + "value": false + }, + "bridge_wall_coast": { + "default_value": 10 + }, + "bridge_fan_speed": { + "default_value": 100 + }, + "bridge_fan_speed_2": { + "resolve": "max(cool_fan_speed, 50)" + }, + "bridge_fan_speed_3": { + "resolve": "max(cool_fan_speed, 20)" + }, + "cool_min_layer_time_fan_speed_max": { + "default_value": 20 + }, + "cool_min_layer_time": { + "value": 15 + }, + "cool_fan_speed_min": { + "value": "cool_fan_speed" + }, + "cool_fan_full_at_height": { + "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" + }, + "cool_fan_full_layer": { + "value": 4 + }, + "wall_line_count": { + "value": 3 + }, + "bottom_layers": { + "value": 3 + }, + "top_layers": { + "value": 3 + }, + "travel_retract_before_outer_wall": { + "value": false + }, + "z_seam_type": { + "value": "'shortest'" + }, + "brim_width": { + "default_value": 5 + }, + "infill_randomize_start_location": { + "default_value": true + }, + "skin_overlap": { + "value": 10.0 + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_travel_layer_0": { + "value": "math.ceil(speed_travel * 0.4)" + }, + "speed_print": { + "value": 100, + "maximum_value_warning": 151, + "maximum_value": 250 + }, + "retraction_count_max": { + "value": 20 + }, + "speed_wall": { + "value": "math.ceil(speed_print * 0.33)" + }, + "speed_wall_0": { + "value": "math.ceil(speed_print * 0.33)" + }, + "speed_wall_x": { + "value": "math.ceil(speed_print * 0.66)" + }, + "speed_topbottom": { + "value": "math.ceil(speed_print * 0.33)" + }, + "speed_roofing": { + "value": "math.ceil(speed_print * 0.33)" + }, + "retraction_retract_speed": { + "maximum_value_warning": 130 + }, + "retraction_prime_speed": { + "value": "math.ceil(retraction_speed * 0.4)", + "maximum_value_warning": 130 + }, + "retraction_extrusion_window": { + "value": "retraction_amount" + }, + "infill_overlap": { + "value": "10 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", + "maximum_value_warning": 100, + "minimum_value_warning": -50 + } + } +} diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index 5b2f799f2a..ae4ac76b95 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -264,4 +264,4 @@ "wall_thickness": {"value": "line_width * 2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/creality_cr6se.def.json b/resources/definitions/creality_cr6se.def.json new file mode 100644 index 0000000000..420173fe61 --- /dev/null +++ b/resources/definitions/creality_cr6se.def.json @@ -0,0 +1,26 @@ +{ + "name": "Creality CR-6 SE", + "version": 2, + "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, + "overrides": { + "machine_name": { "default_value": "Creality CR-6 SE" }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 250 }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + } + } + diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 82308dea3f..58afc2350e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2100,6 +2100,7 @@ "default_value": 0.8, "minimum_value": "0", "maximum_value": "machine_height", + "maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10", "type": "float", "value": "0 if infill_sparse_density > 0 else 0", "limit_to_extruder": "infill_extruder_nr", @@ -2113,6 +2114,7 @@ "description": "The number of infill layers that supports skin edges.", "default_value": 4, "minimum_value": "0", + "maximum_value_warning": "10", "type": "int", "value": "math.ceil(round(skin_edge_support_thickness / resolveOrValue('infill_sparse_thickness'), 4))", "limit_to_extruder": "infill_extruder_nr", @@ -2259,7 +2261,7 @@ "material_bed_temperature": { "label": "Build Plate Temperature", - "description": "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted.", + "description": "The temperature used for the heated build plate. If this is 0, the build plate is left unheated.", "unit": "°C", "type": "float", "default_value": 60, @@ -2277,7 +2279,7 @@ "material_bed_temperature_layer_0": { "label": "Build Plate Temperature Initial Layer", - "description": "The temperature used for the heated build plate at the first layer.", + "description": "The temperature used for the heated build plate at the first layer. If this is 0, the build plate is left unheated during the first layer.", "unit": "°C", "type": "float", "resolve": "max(extruderValues('material_bed_temperature_layer_0'))", @@ -4587,8 +4589,9 @@ "limit_to_extruder": "support_infill_extruder_nr", "minimum_value_warning": "0", "maximum_value_warning": "10", - "enabled": "support_enable and support_structure == 'normal'", - "settable_per_mesh": true + "enabled": "(support_enable and support_structure == 'normal') or support_meshes_present", + "settable_per_mesh": false, + "settable_per_extruder": true }, "support_offset": { @@ -4601,7 +4604,8 @@ "minimum_value_warning": "-1 * machine_nozzle_size", "maximum_value_warning": "10 * machine_nozzle_size", "enabled": "(support_enable and support_structure == 'normal') or support_meshes_present", - "settable_per_mesh": true + "settable_per_mesh": false, + "settable_per_extruder": true }, "support_infill_sparse_thickness": { @@ -4616,7 +4620,8 @@ "value": "resolveOrValue('layer_height')", "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": false + "settable_per_mesh": false, + "settable_per_extruder": true }, "gradual_support_infill_steps": { @@ -4629,7 +4634,8 @@ "maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))", "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": false + "settable_per_mesh": false, + "settable_per_extruder": true }, "gradual_support_infill_step_height": { @@ -4642,7 +4648,8 @@ "minimum_value_warning": "3 * resolveOrValue('layer_height')", "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0 and gradual_support_infill_steps > 0", "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": false + "settable_per_mesh": false, + "settable_per_extruder": true }, "minimum_support_area": { @@ -5817,7 +5824,7 @@ "type": "float", "default_value": 6, "minimum_value": "0", - "maximum_value_warning": "(resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height')", + "maximum_value_warning": "(resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume", "enabled": "resolveOrValue('prime_tower_enable')", "settable_per_mesh": false, "settable_per_extruder": true @@ -5844,7 +5851,7 @@ "unit": "mm", "enabled": "resolveOrValue('prime_tower_enable')", "default_value": 200, - "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - max(map(abs, extruderValues('machine_nozzle_offset_y'))) - 1", + "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - max(map(abs, extruderValues('machine_nozzle_offset_y'))) - 3", "maximum_value": "machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, diff --git a/resources/definitions/fusedform_300.def.json b/resources/definitions/fusedform_300.def.json new file mode 100644 index 0000000000..ede824968d --- /dev/null +++ b/resources/definitions/fusedform_300.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "FF300", + "inherits": "fusedform_base", + + "metadata": { + "quality_definition": "fusedform_base", + "visible": true + }, + + "overrides": { + "machine_name": { "default_value": "FF300" }, + "machine_width": { "default_value": 360 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 320 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_acceleration_x": {"value":1200}, + "machine_max_acceleration_y": {"value":1200}, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 8 }, + "machine_max_jerk_z": { "default_value": 0.3 }, + "machine_max_jerk_e": { "default_value": 5 }, + "acceleration_travel": {"value":1000} + } +} diff --git a/resources/definitions/fusedform_600.def.json b/resources/definitions/fusedform_600.def.json new file mode 100644 index 0000000000..0b8c647398 --- /dev/null +++ b/resources/definitions/fusedform_600.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "FF600", + "inherits": "fusedform_base", + + "metadata": { + "quality_definition": "fusedform_base", + "visible": true + }, + + "overrides": { + "machine_name": { "default_value": "FF600" }, + "machine_width": { "default_value": 500 }, + "machine_depth": { "default_value": 500 }, + "machine_height": { "default_value": 600 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_acceleration_x": {"value":1200}, + "machine_max_acceleration_y": {"value":1200}, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 8 }, + "machine_max_jerk_z": { "default_value": 0.3 }, + "machine_max_jerk_e": { "default_value": 5 }, + "acceleration_travel": {"value":800} + } +} diff --git a/resources/definitions/fusedform_600plus.def.json b/resources/definitions/fusedform_600plus.def.json new file mode 100644 index 0000000000..83012cbc39 --- /dev/null +++ b/resources/definitions/fusedform_600plus.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "FF600plus", + "inherits": "fusedform_base", + + "metadata": { + "quality_definition": "fusedform_base", + "visible": true + }, + + "overrides": { + "machine_name": { "default_value": "FF600plus" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 600 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_acceleration_x": {"value":1200}, + "machine_max_acceleration_y": {"value":1200}, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 8 }, + "machine_max_jerk_z": { "default_value": 0.3 }, + "machine_max_jerk_e": { "default_value": 5 }, + "acceleration_travel": {"value":800} + } + +} diff --git a/resources/definitions/fusedform_base.def.json b/resources/definitions/fusedform_base.def.json new file mode 100644 index 0000000000..059cba523e --- /dev/null +++ b/resources/definitions/fusedform_base.def.json @@ -0,0 +1,81 @@ +{ + "version": 2, + "name": "fusedform_base", + "inherits": "fdmprinter", + "metadata": { + "author": "Juan Blanco", + "manufacturer": "Fused Form", + "visible": false, + "machine_extruder_trains":{"0": "fusedform_base_extruder_0"}, + "preferred_material": "generic_pla", + "exclude_materials": [ "structur3d_dap100silicone" ], + "has_machine_quality": true, + "has_materials": true, + "preferred_quality_type": "normal" + }, + + "overrides": { + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": {"default_value": false}, + "machine_head_with_fans_polygon":{"default_value": [ + [ -20, 20 ], + [ -20, -20 ], + [ 18, 20 ], + [ 18, -18 ] + ] + }, + "gantry_height": {"value": "70"}, + + "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "machine_start_gcode": {"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\n;Put printing message on LCD screen\nM117 Printing..."}, + "machine_end_gcode": {"value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM107 ; Fans off'"}, + + "layer_height": { "default_value": 0.15 }, + "layer_height_0": { "default_value": 0.2 }, + + "wall_line_count":{ "value": 3 }, + "wall_thickness": { "value": 1.2 }, + "top_bottom_thickness": {"value": 1.5}, + "optimize_wall_printing_order": {"value": true}, + + "infill_sparse_density": {"value":15}, + "infill_overlap": {"value": 0}, + + "speed_print": { "value": 45 }, + "speed_infill": { "value": 45 }, + "speed_travel": { "value": 75 }, + "speed_topbottom": {"value": 40 }, + "speed_wall": { "value": 35 }, + "speed_wall_x": { "value": 40 }, + "speed_equalize_flow_max": { "value": 70 }, + + "retraction_enable": {"default_value":true}, + "retraction_amount": { "default_value": 4 }, + "retraction_speed": { "default_value": 70}, + "retraction_min_travel": {"value":5 }, + "retraction_hop": {"default_value":0.2}, + "retraction_hop_enabled": {"value":true}, + "speed_z_hop": {"value":2.5 }, + + "cool_fan_enabled": {"default_value":true}, + "cool_fan_full_at_height": {"value":0.4}, + "cool_fan_full_layer": {"value":2}, + "cool_min_speed": {"value":30}, + + "support_enable": {"value":true}, + "support_angle": {"default_value": 50}, + "support_brim_enable": {"value":true}, + "support_infill_angles": {"value":[-45]}, + "support_interface_density": {"value": 70}, + "support_interface_enable": {"value": true }, + "support_interface_height": {"value": 0.5}, + "support_interface_pattern": {"default_value":"lines"}, + "support_pattern": {"default_value":"lines"}, + "support_xy_distance": {"value": 0.5}, + "support_z_distance": {"value": 0.3 }, + + + "adhesion_type": {"default_value":"skirt"} + } +} diff --git a/resources/definitions/fusedform_mini.def.json b/resources/definitions/fusedform_mini.def.json new file mode 100644 index 0000000000..abd532dd2a --- /dev/null +++ b/resources/definitions/fusedform_mini.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name":"FFmini", + "inherits": "fusedform_base", + + "metadata": { + "quality_definition": "fusedform_base", + "visible": true + }, + + "overrides": { + "machine_name": { "default_value": "FFmini" }, + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 240 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_acceleration_x": {"value":1200}, + "machine_max_acceleration_y": {"value":1200}, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 14 }, + "machine_max_jerk_z": { "default_value": 0.3 }, + "machine_max_jerk_e": { "default_value": 5 }, + "acceleration_travel": {"value":1000} + } +} diff --git a/resources/definitions/fusedform_std.def.json b/resources/definitions/fusedform_std.def.json new file mode 100644 index 0000000000..275f244152 --- /dev/null +++ b/resources/definitions/fusedform_std.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "FFSTD", + "inherits": "fusedform_base", + + "metadata": { + "quality_definition": "fusedform_base", + "visible": true + }, + + "overrides": { + "machine_name": { "default_value": "FFSTD" }, + "machine_width": { "default_value": 240 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 320 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_acceleration_x": {"value":1200}, + "machine_max_acceleration_y": {"value":1200}, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_acceleration": { "default_value": 900 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.3 }, + "machine_max_jerk_e": { "default_value": 5 }, + "acceleration_travel": {"value":1200} + } +} diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 4b1e4a3fbd..2858a859c5 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { - "author": "M.K", + "author": "eMotionTech", "manufacturer": "eMotionTech", "visible": true, "file_formats": "text/x-gcode", @@ -84,7 +84,8 @@ "material_flow": { "default_value": 93 }, "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, - "meshfix_maximum_resolution": { "value": "0.03" }, + "meshfix_maximum_resolution": { "value": "0.5" }, + "meshfix_maximum_deviation": { "default_value": 0.04 }, "optimize_wall_printing_order": { "value": "True" }, "prime_blob_enable": { "enabled": false, "default_value": false }, "prime_tower_min_volume": { "default_value": 35 }, diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index f939dcfc34..ff8badd355 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 30 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, "machine_max_feedrate_x": { "value": 150 }, "machine_max_feedrate_y": { "value": 150 }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 54a8d50432..99be1152af 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -24,7 +24,7 @@ }, "overrides": { "machine_name": { "default_value": "Tronxy Base Printer" }, - "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel}\nG0 E3 F200\nG92 E0\n" }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel_layer_0}\nG0 E3 F200\nG92 E0\n" }, "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" }, "machine_max_feedrate_x": { "value": 100 }, diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index 89a093de13..0e70dd72b4 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 40 }, - "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" } } } diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index 26c64807c6..5604b17619 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 40 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"}, "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, "machine_max_feedrate_x": { "value": 100 }, diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 2856e09181..b68a954115 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 40 }, - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n "}, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n "}, "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" }, "machine_max_feedrate_x": { "value": 150 }, diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index 15f0f11f26..eaae1dbb08 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 40 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, "machine_max_feedrate_x": { "value": 100 }, diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index 6e771fafd3..59e727bbb0 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 40 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, "machine_max_feedrate_x": { "value": 100 }, diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 5e0ada7916..db03c344f5 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -22,7 +22,7 @@ }, "gantry_height": { "value": 30 }, - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"}, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"}, "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }, "machine_max_feedrate_x": { "value": 100 }, diff --git a/resources/extruders/biqu_base_extruder_0.def.json b/resources/extruders/biqu_base_extruder_0.def.json new file mode 100755 index 0000000000..205bc87d8f --- /dev/null +++ b/resources/extruders/biqu_base_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "biqu_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/blv_mgn_cube_extruder_0.def.json b/resources/extruders/blv_mgn_cube_extruder_0.def.json new file mode 100644 index 0000000000..4a5ed97f47 --- /dev/null +++ b/resources/extruders/blv_mgn_cube_extruder_0.def.json @@ -0,0 +1,20 @@ +{ + "name": "Extruder 1", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "blv_mgn_cube_base", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} \ No newline at end of file diff --git a/resources/extruders/fusedform_base_extruder_0.def.json b/resources/extruders/fusedform_base_extruder_0.def.json new file mode 100644 index 0000000000..19ecc0915d --- /dev/null +++ b/resources/extruders/fusedform_base_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "fusedform_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/meshes/BIQU_SSS.stl b/resources/meshes/BIQU_SSS.stl new file mode 100755 index 0000000000..8a0b046a60 Binary files /dev/null and b/resources/meshes/BIQU_SSS.stl differ diff --git a/resources/meshes/blv_mgn_cube_300_platform.3mf b/resources/meshes/blv_mgn_cube_300_platform.3mf new file mode 100644 index 0000000000..ccd785c6d4 Binary files /dev/null and b/resources/meshes/blv_mgn_cube_300_platform.3mf differ diff --git a/resources/meshes/blv_mgn_cube_350_platform.3mf b/resources/meshes/blv_mgn_cube_350_platform.3mf new file mode 100644 index 0000000000..1c95e7364b Binary files /dev/null and b/resources/meshes/blv_mgn_cube_350_platform.3mf differ diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 57253b9dff..489ff1f33e 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -37,7 +37,7 @@ TabView { reevaluateLinkedMaterials = false; } - if (!base.containerId || !base.editingEnabled) + if (!base.containerId || !base.editingEnabled || !base.currentMaterialNode) { return "" } diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index fdb961ad21..5ee6dc32ce 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -313,7 +313,7 @@ Item { messageDialog.icon = StandardIcon.Information; } - else if (result.status == "duplicate") + else if (result.status == "warning" || result.status == "duplicate") { messageDialog.icon = StandardIcon.Warning; } diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 6ac567b0b1..c2706cb8d4 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -73,11 +73,6 @@ Item { Cura.API.account.login() } - else - { - Qt.openUrlExternally("https://mycloud.ultimaker.com/") - } - } } } diff --git a/resources/quality/biqu/base/base_0.2_ABS_super.inst.cfg b/resources/quality/biqu/base/base_0.2_ABS_super.inst.cfg new file mode 100755 index 0000000000..ec804e8bab --- /dev/null +++ b/resources/quality/biqu/base/base_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_abs_175 +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/biqu/base/base_0.2_ABS_ultra.inst.cfg b/resources/quality/biqu/base/base_0.2_ABS_ultra.inst.cfg new file mode 100755 index 0000000000..4e1508e73d --- /dev/null +++ b/resources/quality/biqu/base/base_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = ultra +material = generic_abs_175 +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/biqu/base/base_0.2_PETG_super.inst.cfg b/resources/quality/biqu/base/base_0.2_PETG_super.inst.cfg new file mode 100755 index 0000000000..7d7185837e --- /dev/null +++ b/resources/quality/biqu/base/base_0.2_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_petg_175 +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 diff --git a/resources/quality/biqu/base/base_0.2_PETG_ultra.inst.cfg b/resources/quality/biqu/base/base_0.2_PETG_ultra.inst.cfg new file mode 100755 index 0000000000..8d1c0a7938 --- /dev/null +++ b/resources/quality/biqu/base/base_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Ultra Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = ultra +material = generic_petg_175 +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 diff --git a/resources/quality/biqu/base/base_0.2_PLA_super.inst.cfg b/resources/quality/biqu/base/base_0.2_PLA_super.inst.cfg new file mode 100755 index 0000000000..3acdd46ade --- /dev/null +++ b/resources/quality/biqu/base/base_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_pla_175 +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.2_PLA_ultra.inst.cfg b/resources/quality/biqu/base/base_0.2_PLA_ultra.inst.cfg new file mode 100755 index 0000000000..421584b154 --- /dev/null +++ b/resources/quality/biqu/base/base_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = ultra +material = generic_pla_175 +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.3_ABS_adaptive.inst.cfg new file mode 100755 index 0000000000..cfaa3dcb0c --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_abs_175 +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_ABS_low.inst.cfg b/resources/quality/biqu/base/base_0.3_ABS_low.inst.cfg new file mode 100755 index 0000000000..96bfa20f10 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_abs_175 +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_ABS_standard.inst.cfg b/resources/quality/biqu/base/base_0.3_ABS_standard.inst.cfg new file mode 100755 index 0000000000..01a5ae8f8c --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_abs_175 +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_ABS_super.inst.cfg b/resources/quality/biqu/base/base_0.3_ABS_super.inst.cfg new file mode 100755 index 0000000000..767bb7767a --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_abs_175 +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.3_PETG_adaptive.inst.cfg new file mode 100755 index 0000000000..2ad747db7e --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_petg_175 +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_PETG_low.inst.cfg b/resources/quality/biqu/base/base_0.3_PETG_low.inst.cfg new file mode 100755 index 0000000000..c5fda34eaa --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PETG_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_petg_175 +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_PETG_standard.inst.cfg b/resources/quality/biqu/base/base_0.3_PETG_standard.inst.cfg new file mode 100755 index 0000000000..fcdb1220c0 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_petg_175 +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_PETG_super.inst.cfg b/resources/quality/biqu/base/base_0.3_PETG_super.inst.cfg new file mode 100755 index 0000000000..2f66939544 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_petg_175 +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.3_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.3_PLA_adaptive.inst.cfg new file mode 100755 index 0000000000..7aff470176 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_pla_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_PLA_low.inst.cfg b/resources/quality/biqu/base/base_0.3_PLA_low.inst.cfg new file mode 100755 index 0000000000..17c1c725c2 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_pla_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_PLA_standard.inst.cfg b/resources/quality/biqu/base/base_0.3_PLA_standard.inst.cfg new file mode 100755 index 0000000000..02720317ea --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_pla_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_PLA_super.inst.cfg b/resources/quality/biqu/base/base_0.3_PLA_super.inst.cfg new file mode 100755 index 0000000000..012306c17b --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_pla_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.3_TPU_adaptive.inst.cfg new file mode 100755 index 0000000000..d9a32f183f --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_tpu_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_TPU_standard.inst.cfg b/resources/quality/biqu/base/base_0.3_TPU_standard.inst.cfg new file mode 100755 index 0000000000..a267cb9b89 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_tpu_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.3_TPU_super.inst.cfg b/resources/quality/biqu/base/base_0.3_TPU_super.inst.cfg new file mode 100755 index 0000000000..abcabd8285 --- /dev/null +++ b/resources/quality/biqu/base/base_0.3_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_tpu_175 +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.4_ABS_adaptive.inst.cfg new file mode 100755 index 0000000000..44dd5065cb --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_abs_175 +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_ABS_low.inst.cfg b/resources/quality/biqu/base/base_0.4_ABS_low.inst.cfg new file mode 100755 index 0000000000..fb5d1ad439 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_abs_175 +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_ABS_standard.inst.cfg b/resources/quality/biqu/base/base_0.4_ABS_standard.inst.cfg new file mode 100755 index 0000000000..f8319878cc --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_abs_175 +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_ABS_super.inst.cfg b/resources/quality/biqu/base/base_0.4_ABS_super.inst.cfg new file mode 100755 index 0000000000..8dc442790e --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_abs_175 +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.4_PETG_adaptive.inst.cfg new file mode 100755 index 0000000000..8813bdae3b --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_petg_175 +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_PETG_low.inst.cfg b/resources/quality/biqu/base/base_0.4_PETG_low.inst.cfg new file mode 100755 index 0000000000..8fc3ae87b3 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PETG_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_petg_175 +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_PETG_standard.inst.cfg b/resources/quality/biqu/base/base_0.4_PETG_standard.inst.cfg new file mode 100755 index 0000000000..d60458d612 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_petg_175 +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_PETG_super.inst.cfg b/resources/quality/biqu/base/base_0.4_PETG_super.inst.cfg new file mode 100755 index 0000000000..264c64e1d0 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_petg_175 +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.4_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.4_PLA_adaptive.inst.cfg new file mode 100755 index 0000000000..c25090ead6 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_pla_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_PLA_low.inst.cfg b/resources/quality/biqu/base/base_0.4_PLA_low.inst.cfg new file mode 100755 index 0000000000..bee1419010 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_pla_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_PLA_standard.inst.cfg b/resources/quality/biqu/base/base_0.4_PLA_standard.inst.cfg new file mode 100755 index 0000000000..0d70eb4c77 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_pla_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_PLA_super.inst.cfg b/resources/quality/biqu/base/base_0.4_PLA_super.inst.cfg new file mode 100755 index 0000000000..6081cae7ae --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_pla_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.4_TPU_adaptive.inst.cfg new file mode 100755 index 0000000000..9bd256c1a8 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_tpu_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_TPU_standard.inst.cfg b/resources/quality/biqu/base/base_0.4_TPU_standard.inst.cfg new file mode 100755 index 0000000000..3c2c0dd142 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_tpu_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.4_TPU_super.inst.cfg b/resources/quality/biqu/base/base_0.4_TPU_super.inst.cfg new file mode 100755 index 0000000000..5bcd03f334 --- /dev/null +++ b/resources/quality/biqu/base/base_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_tpu_175 +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.5_ABS_adaptive.inst.cfg new file mode 100755 index 0000000000..f72b0f2a58 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_abs_175 +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_ABS_low.inst.cfg b/resources/quality/biqu/base/base_0.5_ABS_low.inst.cfg new file mode 100755 index 0000000000..99713d0632 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_abs_175 +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_ABS_standard.inst.cfg b/resources/quality/biqu/base/base_0.5_ABS_standard.inst.cfg new file mode 100755 index 0000000000..2f41f70334 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_abs_175 +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_ABS_super.inst.cfg b/resources/quality/biqu/base/base_0.5_ABS_super.inst.cfg new file mode 100755 index 0000000000..9d395b3936 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_abs_175 +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.5_PETG_adaptive.inst.cfg new file mode 100755 index 0000000000..487450666d --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_petg_175 +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_PETG_low.inst.cfg b/resources/quality/biqu/base/base_0.5_PETG_low.inst.cfg new file mode 100755 index 0000000000..01eb05906b --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PETG_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_petg_175 +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_PETG_standard.inst.cfg b/resources/quality/biqu/base/base_0.5_PETG_standard.inst.cfg new file mode 100755 index 0000000000..0f0a2e4ace --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_petg_175 +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_PETG_super.inst.cfg b/resources/quality/biqu/base/base_0.5_PETG_super.inst.cfg new file mode 100755 index 0000000000..6a3809b16d --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_petg_175 +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/biqu/base/base_0.5_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.5_PLA_adaptive.inst.cfg new file mode 100755 index 0000000000..d3fe56fef5 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_pla_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_PLA_low.inst.cfg b/resources/quality/biqu/base/base_0.5_PLA_low.inst.cfg new file mode 100755 index 0000000000..961018cb7a --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_pla_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_PLA_standard.inst.cfg b/resources/quality/biqu/base/base_0.5_PLA_standard.inst.cfg new file mode 100755 index 0000000000..e52c88a8ff --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_pla_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_PLA_super.inst.cfg b/resources/quality/biqu/base/base_0.5_PLA_super.inst.cfg new file mode 100755 index 0000000000..d31a01893c --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_pla_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/base_0.5_TPU_adaptive.inst.cfg new file mode 100755 index 0000000000..b68bf9621b --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +material = generic_tpu_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_TPU_standard.inst.cfg b/resources/quality/biqu/base/base_0.5_TPU_standard.inst.cfg new file mode 100755 index 0000000000..6d41c9af22 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_tpu_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.5_TPU_super.inst.cfg b/resources/quality/biqu/base/base_0.5_TPU_super.inst.cfg new file mode 100755 index 0000000000..f93caed975 --- /dev/null +++ b/resources/quality/biqu/base/base_0.5_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +material = generic_tpu_175 +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.6_ABS_standard.inst.cfg b/resources/quality/biqu/base/base_0.6_ABS_standard.inst.cfg new file mode 100755 index 0000000000..e2b2f73bed --- /dev/null +++ b/resources/quality/biqu/base/base_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_abs_175 +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/biqu/base/base_0.6_PETG_standard.inst.cfg b/resources/quality/biqu/base/base_0.6_PETG_standard.inst.cfg new file mode 100755 index 0000000000..add215be41 --- /dev/null +++ b/resources/quality/biqu/base/base_0.6_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_petg_175 +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 diff --git a/resources/quality/biqu/base/base_0.6_PLA_draft.inst.cfg b/resources/quality/biqu/base/base_0.6_PLA_draft.inst.cfg new file mode 100755 index 0000000000..70389a2335 --- /dev/null +++ b/resources/quality/biqu/base/base_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_pla_175 +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.6_PLA_low.inst.cfg b/resources/quality/biqu/base/base_0.6_PLA_low.inst.cfg new file mode 100755 index 0000000000..68423c7f95 --- /dev/null +++ b/resources/quality/biqu/base/base_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +material = generic_pla_175 +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.6_PLA_standard.inst.cfg b/resources/quality/biqu/base/base_0.6_PLA_standard.inst.cfg new file mode 100755 index 0000000000..a4230991c6 --- /dev/null +++ b/resources/quality/biqu/base/base_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_pla_175 +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.6_TPU_standard.inst.cfg b/resources/quality/biqu/base/base_0.6_TPU_standard.inst.cfg new file mode 100755 index 0000000000..c01b4dfecd --- /dev/null +++ b/resources/quality/biqu/base/base_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +material = generic_tpu_175 +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.8_ABS_draft.inst.cfg b/resources/quality/biqu/base/base_0.8_ABS_draft.inst.cfg new file mode 100755 index 0000000000..1101e290da --- /dev/null +++ b/resources/quality/biqu/base/base_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_abs_175 +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/biqu/base/base_0.8_PETG_draft.inst.cfg b/resources/quality/biqu/base/base_0.8_PETG_draft.inst.cfg new file mode 100755 index 0000000000..52214da812 --- /dev/null +++ b/resources/quality/biqu/base/base_0.8_PETG_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_petg_175 +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 diff --git a/resources/quality/biqu/base/base_0.8_PLA_draft.inst.cfg b/resources/quality/biqu/base/base_0.8_PLA_draft.inst.cfg new file mode 100755 index 0000000000..8aca9d4577 --- /dev/null +++ b/resources/quality/biqu/base/base_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_pla_175 +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_0.8_TPU_draft.inst.cfg b/resources/quality/biqu/base/base_0.8_TPU_draft.inst.cfg new file mode 100755 index 0000000000..ca881da56d --- /dev/null +++ b/resources/quality/biqu/base/base_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_tpu_175 +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_1.0_ABS_draft.inst.cfg b/resources/quality/biqu/base/base_1.0_ABS_draft.inst.cfg new file mode 100755 index 0000000000..280d64a865 --- /dev/null +++ b/resources/quality/biqu/base/base_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_abs_175 +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/biqu/base/base_1.0_PETG_draft.inst.cfg b/resources/quality/biqu/base/base_1.0_PETG_draft.inst.cfg new file mode 100755 index 0000000000..c1ad705237 --- /dev/null +++ b/resources/quality/biqu/base/base_1.0_PETG_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_petg_175 +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 diff --git a/resources/quality/biqu/base/base_1.0_PLA_draft.inst.cfg b/resources/quality/biqu/base/base_1.0_PLA_draft.inst.cfg new file mode 100755 index 0000000000..e5cfd1b674 --- /dev/null +++ b/resources/quality/biqu/base/base_1.0_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_pla_175 +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_1.0_TPU_draft.inst.cfg b/resources/quality/biqu/base/base_1.0_TPU_draft.inst.cfg new file mode 100755 index 0000000000..7ce4e77182 --- /dev/null +++ b/resources/quality/biqu/base/base_1.0_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_tpu_175 +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/biqu/base/base_global_adaptive.inst.cfg b/resources/quality/biqu/base/base_global_adaptive.inst.cfg new file mode 100755 index 0000000000..17f2af7e60 --- /dev/null +++ b/resources/quality/biqu/base/base_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/biqu/base/base_global_draft.inst.cfg b/resources/quality/biqu/base/base_global_draft.inst.cfg new file mode 100755 index 0000000000..634c69b15c --- /dev/null +++ b/resources/quality/biqu/base/base_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/biqu/base/base_global_low.inst.cfg b/resources/quality/biqu/base/base_global_low.inst.cfg new file mode 100755 index 0000000000..941aa95784 --- /dev/null +++ b/resources/quality/biqu/base/base_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*4 diff --git a/resources/quality/biqu/base/base_global_standard.inst.cfg b/resources/quality/biqu/base/base_global_standard.inst.cfg new file mode 100755 index 0000000000..0f6c943234 --- /dev/null +++ b/resources/quality/biqu/base/base_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*4 diff --git a/resources/quality/biqu/base/base_global_super.inst.cfg b/resources/quality/biqu/base/base_global_super.inst.cfg new file mode 100755 index 0000000000..82e5cd97b1 --- /dev/null +++ b/resources/quality/biqu/base/base_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/biqu/base/base_global_ultra.inst.cfg b/resources/quality/biqu/base/base_global_ultra.inst.cfg new file mode 100755 index 0000000000..6564ba225b --- /dev/null +++ b/resources/quality/biqu/base/base_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = biqu_base + +[metadata] +setting_version = 16 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*4 +support_interface_height = =layer_height*12 diff --git a/resources/quality/fusedform/base/base_PVA_draft.inst.cfg b/resources/quality/fusedform/base/base_PVA_draft.inst.cfg new file mode 100644 index 0000000000..1a14478d70 --- /dev/null +++ b/resources/quality/fusedform/base/base_PVA_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -2 +material = generic_pva + +[values] +material_print_temperature = 190 +material_bed_temperature = 60 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = 20 +speed_travel = 70 +speed_wall = 20 +speed_wall_x = 25 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_PVA_high.inst.cfg b/resources/quality/fusedform/base/base_PVA_high.inst.cfg new file mode 100644 index 0000000000..86012c4ad2 --- /dev/null +++ b/resources/quality/fusedform/base/base_PVA_high.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_pva + +[values] +material_print_temperature = 190 +material_bed_temperature = 60 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = 20 +speed_travel = 70 +speed_wall = 20 +speed_wall_x = 25 diff --git a/resources/quality/fusedform/base/base_PVA_normal.inst.cfg b/resources/quality/fusedform/base/base_PVA_normal.inst.cfg new file mode 100644 index 0000000000..b4b59a2476 --- /dev/null +++ b/resources/quality/fusedform/base/base_PVA_normal.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Normal quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_pva + +[values] +material_print_temperature = 190 +material_bed_temperature = 60 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = 20 +speed_travel = 70 +speed_wall = 20 +speed_wall_x = 25 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_abs_draft.inst.cfg b/resources/quality/fusedform/base/base_abs_draft.inst.cfg new file mode 100644 index 0000000000..fe228582e2 --- /dev/null +++ b/resources/quality/fusedform/base/base_abs_draft.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Draft Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_abs + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_abs_high.inst.cfg b/resources/quality/fusedform/base/base_abs_high.inst.cfg new file mode 100644 index 0000000000..25f4abe26d --- /dev/null +++ b/resources/quality/fusedform/base/base_abs_high.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_abs + + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_abs_normal.inst.cfg b/resources/quality/fusedform/base/base_abs_normal.inst.cfg new file mode 100644 index 0000000000..702fd71d7f --- /dev/null +++ b/resources/quality/fusedform/base/base_abs_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_abs + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg new file mode 100644 index 0000000000..8a1c2c81ce --- /dev/null +++ b/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Ultra High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type =ultra high +weight = -1 +material = generic_abs + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_draft.inst.cfg b/resources/quality/fusedform/base/base_draft.inst.cfg new file mode 100644 index 0000000000..434e5130b3 --- /dev/null +++ b/resources/quality/fusedform/base/base_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -4 +global_quality=True + +[values] +layer_height = 0.25 diff --git a/resources/quality/fusedform/base/base_flex_high.inst.cfg b/resources/quality/fusedform/base/base_flex_high.inst.cfg new file mode 100644 index 0000000000..a842c25e0b --- /dev/null +++ b/resources/quality/fusedform/base/base_flex_high.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_tpu + +[values] +layer_height_0 = 0.25 +material_print_temperature = 220 +material_bed_temperature = 60 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = 20 +speed_travel = 70 +speed_wall = 20 +speed_wall_x = 25 diff --git a/resources/quality/fusedform/base/base_flex_normal.inst.cfg b/resources/quality/fusedform/base/base_flex_normal.inst.cfg new file mode 100644 index 0000000000..cc5ea842bb --- /dev/null +++ b/resources/quality/fusedform/base/base_flex_normal.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Normal quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_tpu + +[values] +layer_height_0 = 0.25 +material_print_temperature = 220 +material_bed_temperature = 60 +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 25 +speed_topbottom = 20 +speed_travel = 70 +speed_wall = 20 +speed_wall_x = 25 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_high.inst.cfg b/resources/quality/fusedform/base/base_high.inst.cfg new file mode 100644 index 0000000000..b02ef47528 --- /dev/null +++ b/resources/quality/fusedform/base/base_high.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +global_quality=True + + +[values] +layer_height = 0.1 diff --git a/resources/quality/fusedform/base/base_hips_draft.inst.cfg b/resources/quality/fusedform/base/base_hips_draft.inst.cfg new file mode 100644 index 0000000000..c1061abe98 --- /dev/null +++ b/resources/quality/fusedform/base/base_hips_draft.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Draft Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_hips + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_hips_high.inst.cfg b/resources/quality/fusedform/base/base_hips_high.inst.cfg new file mode 100644 index 0000000000..8ea0458964 --- /dev/null +++ b/resources/quality/fusedform/base/base_hips_high.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_hips + + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_hips_normal.inst.cfg b/resources/quality/fusedform/base/base_hips_normal.inst.cfg new file mode 100644 index 0000000000..1b3a407be4 --- /dev/null +++ b/resources/quality/fusedform/base/base_hips_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_hips + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg new file mode 100644 index 0000000000..f9ef4f7042 --- /dev/null +++ b/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Ultra High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type =ultra high +weight = -1 +material = generic_hips + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 90 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_normal.inst.cfg b/resources/quality/fusedform/base/base_normal.inst.cfg new file mode 100644 index 0000000000..05774db49c --- /dev/null +++ b/resources/quality/fusedform/base/base_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +global_quality=True + +[values] +layer_height = 0.15 diff --git a/resources/quality/fusedform/base/base_nylon_draft.inst.cfg b/resources/quality/fusedform/base/base_nylon_draft.inst.cfg new file mode 100644 index 0000000000..adfd943759 --- /dev/null +++ b/resources/quality/fusedform/base/base_nylon_draft.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Draft Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +material = generic_nylon + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 40 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 265 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_nylon_high.inst.cfg b/resources/quality/fusedform/base/base_nylon_high.inst.cfg new file mode 100644 index 0000000000..c9c3f38252 --- /dev/null +++ b/resources/quality/fusedform/base/base_nylon_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_nylon + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 40 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 265 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_nylon_normal.inst.cfg b/resources/quality/fusedform/base/base_nylon_normal.inst.cfg new file mode 100644 index 0000000000..83fc6dd543 --- /dev/null +++ b/resources/quality/fusedform/base/base_nylon_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_nylon + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 40 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 265 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg new file mode 100644 index 0000000000..67d4384610 --- /dev/null +++ b/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Ultra High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type =ultra high +weight = -1 +material = generic_nylon + +[values] +cool_fan_enabled = False +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 40 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 265 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_petg_high.inst.cfg b/resources/quality/fusedform/base/base_petg_high.inst.cfg new file mode 100644 index 0000000000..890d85ded5 --- /dev/null +++ b/resources/quality/fusedform/base/base_petg_high.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_petg + +[values] +cool_fan_enabled = True +cool_fan_speed=30 +cool_fan_speed_max=40 +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 70 +material_print_temperature = 245 +speed_infill = =speed_print +speed_layer_0 = 30 +speed_print = 30 +speed_topbottom = 30 +speed_travel = 70 +speed_wall = 28 +speed_wall_x = 30 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_petg_normal.inst.cfg b/resources/quality/fusedform/base/base_petg_normal.inst.cfg new file mode 100644 index 0000000000..862976042c --- /dev/null +++ b/resources/quality/fusedform/base/base_petg_normal.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Normal Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_petg + +[values] +cool_fan_enabled = True +cool_fan_speed=30 +cool_fan_speed_max=40 +brim_width = 12 +support_brim_enable = True +adhesion_type = brim +material_bed_temperature = 70 +material_print_temperature = 245 +speed_infill = =speed_print +speed_layer_0 = 30 +speed_print = 30 +speed_topbottom = 30 +speed_travel = 70 +speed_wall = 28 +speed_wall_x = 30 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_pla_draft.inst.cfg b/resources/quality/fusedform/base/base_pla_draft.inst.cfg new file mode 100644 index 0000000000..35952fe582 --- /dev/null +++ b/resources/quality/fusedform/base/base_pla_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = draft +weight = -4 +material = generic_pla + +[values] +material_bed_temperature = 60 +material_print_temperature = 210 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_pla_high.inst.cfg b/resources/quality/fusedform/base/base_pla_high.inst.cfg new file mode 100644 index 0000000000..187723811c --- /dev/null +++ b/resources/quality/fusedform/base/base_pla_high.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = high +weight = -1 +material = generic_pla + +[values] +material_bed_temperature = 60 +material_print_temperature = 210 diff --git a/resources/quality/fusedform/base/base_pla_normal.inst.cfg b/resources/quality/fusedform/base/base_pla_normal.inst.cfg new file mode 100644 index 0000000000..87424e63a0 --- /dev/null +++ b/resources/quality/fusedform/base/base_pla_normal.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Normal Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type = normal +weight = -2 +material = generic_pla + +[values] +material_bed_temperature = 60 +material_print_temperature = 210 \ No newline at end of file diff --git a/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg new file mode 100644 index 0000000000..4e9f14101b --- /dev/null +++ b/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name =Ultra High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type =ultra high +weight = -2 +material = generic_pla + +[values] +material_bed_temperature = 60 +material_print_temperature = 210 diff --git a/resources/quality/fusedform/base/base_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_ultra_high.inst.cfg new file mode 100644 index 0000000000..9562c35151 --- /dev/null +++ b/resources/quality/fusedform/base/base_ultra_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra High Quality +definition = fusedform_base + +[metadata] +setting_version = 16 +type = quality +quality_type =ultra high +weight = -1 +global_quality=True + +[values] +layer_height = 0.08 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg new file mode 100644 index 0000000000..08f8508763 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 16 +type = quality +quality_type = a +weight = 1 +material = emotiontech_acetate +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 10 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg new file mode 100644 index 0000000000..8bb20b2914 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 16 +type = quality +quality_type = b +weight = 0 +material = emotiontech_acetate +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 7 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature + 0 +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg new file mode 100644 index 0000000000..6169d736c3 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 16 +type = quality +quality_type = c +weight = -1 +material = emotiontech_acetate +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 5 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg new file mode 100644 index 0000000000..0d3d36fdad --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 16 +type = quality +quality_type = b +weight = 1 +material = emotiontech_acetate +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg new file mode 100644 index 0000000000..9e088490bd --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 16 +type = quality +quality_type = c +weight = 0 +material = emotiontech_acetate +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature + 0 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg similarity index 54% rename from resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg rename to resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg index 91e071075f..d69b80028b 100644 --- a/resources/quality/strateo3d/Standard_1.2/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg @@ -1,46 +1,45 @@ [general] version = 4 -name = H +name = D definition = strateo3d [metadata] setting_version = 16 type = quality -quality_type = h +quality_type = d weight = -1 -material = emotiontech_pla -variant = Standard 1.2 +material = emotiontech_acetate +variant = Standard 0.6 [values] layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -infill_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -support_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 27/35) -speed_wall_0 = =math.ceil(speed_print * 23/35) -speed_topbottom = =math.ceil(speed_print * 30/35) -speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_print = 60 +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) speed_slowdown_layers = 2 cool_fan_enabled = True -cool_fan_speed = 100 +cool_fan_speed = 35 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_min_speed = 10 support_angle = 50 -material_print_temperature = =default_material_print_temperature + 10 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 material_flow = 91 -retraction_extra_prime_amount = 0.5 +retraction_extra_prime_amount = 0.1 retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True -skin_overlap = 20 -support_z_distance = =layer_height*2 -support_bottom_distance = =support_z_distance*0.5 +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 support_offset = 1 diff --git a/resources/variants/biqu_b1_0.2.inst.cfg b/resources/variants/biqu_b1_0.2.inst.cfg new file mode 100755 index 0000000000..e4c6afd6d7 --- /dev/null +++ b/resources/variants/biqu_b1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = biqu_b1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/biqu_b1_0.3.inst.cfg b/resources/variants/biqu_b1_0.3.inst.cfg new file mode 100755 index 0000000000..60406b2b6d --- /dev/null +++ b/resources/variants/biqu_b1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = biqu_b1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/biqu_b1_0.4.inst.cfg b/resources/variants/biqu_b1_0.4.inst.cfg new file mode 100755 index 0000000000..859fb1734d --- /dev/null +++ b/resources/variants/biqu_b1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = biqu_b1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/biqu_b1_0.5.inst.cfg b/resources/variants/biqu_b1_0.5.inst.cfg new file mode 100755 index 0000000000..15860c8868 --- /dev/null +++ b/resources/variants/biqu_b1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = biqu_b1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/biqu_b1_0.6.inst.cfg b/resources/variants/biqu_b1_0.6.inst.cfg new file mode 100755 index 0000000000..c463c950f2 --- /dev/null +++ b/resources/variants/biqu_b1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = biqu_b1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/biqu_b1_0.8.inst.cfg b/resources/variants/biqu_b1_0.8.inst.cfg new file mode 100755 index 0000000000..bc21919a96 --- /dev/null +++ b/resources/variants/biqu_b1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = biqu_b1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/biqu_b1_abl_0.2.inst.cfg b/resources/variants/biqu_b1_abl_0.2.inst.cfg new file mode 100755 index 0000000000..7bf2d629b9 --- /dev/null +++ b/resources/variants/biqu_b1_abl_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = biqu_b1_abl + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/biqu_b1_abl_0.3.inst.cfg b/resources/variants/biqu_b1_abl_0.3.inst.cfg new file mode 100755 index 0000000000..f274aa1fbf --- /dev/null +++ b/resources/variants/biqu_b1_abl_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = biqu_b1_abl + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/biqu_b1_abl_0.4.inst.cfg b/resources/variants/biqu_b1_abl_0.4.inst.cfg new file mode 100755 index 0000000000..28ce693ffb --- /dev/null +++ b/resources/variants/biqu_b1_abl_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = biqu_b1_abl + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/biqu_b1_abl_0.5.inst.cfg b/resources/variants/biqu_b1_abl_0.5.inst.cfg new file mode 100755 index 0000000000..5306437984 --- /dev/null +++ b/resources/variants/biqu_b1_abl_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = biqu_b1_abl + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/biqu_b1_abl_0.6.inst.cfg b/resources/variants/biqu_b1_abl_0.6.inst.cfg new file mode 100755 index 0000000000..e7f1a8ea2c --- /dev/null +++ b/resources/variants/biqu_b1_abl_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = biqu_b1_abl + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/biqu_b1_abl_0.8.inst.cfg b/resources/variants/biqu_b1_abl_0.8.inst.cfg new file mode 100755 index 0000000000..dd4afb9cf8 --- /dev/null +++ b/resources/variants/biqu_b1_abl_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = biqu_b1_abl + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/biqu_base_0.2.inst.cfg b/resources/variants/biqu_base_0.2.inst.cfg new file mode 100755 index 0000000000..37d0c3f5c6 --- /dev/null +++ b/resources/variants/biqu_base_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = biqu_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/biqu_base_0.3.inst.cfg b/resources/variants/biqu_base_0.3.inst.cfg new file mode 100755 index 0000000000..c0d8d286f4 --- /dev/null +++ b/resources/variants/biqu_base_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = biqu_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/biqu_base_0.4.inst.cfg b/resources/variants/biqu_base_0.4.inst.cfg new file mode 100755 index 0000000000..12b4310aa8 --- /dev/null +++ b/resources/variants/biqu_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = biqu_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/biqu_base_0.5.inst.cfg b/resources/variants/biqu_base_0.5.inst.cfg new file mode 100755 index 0000000000..40de2f59dc --- /dev/null +++ b/resources/variants/biqu_base_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = biqu_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/biqu_base_0.6.inst.cfg b/resources/variants/biqu_base_0.6.inst.cfg new file mode 100755 index 0000000000..173fd5a626 --- /dev/null +++ b/resources/variants/biqu_base_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = biqu_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/biqu_base_0.8.inst.cfg b/resources/variants/biqu_base_0.8.inst.cfg new file mode 100755 index 0000000000..d3654c9662 --- /dev/null +++ b/resources/variants/biqu_base_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = biqu_base + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr6se_0.2.inst.cfg b/resources/variants/creality_cr6se_0.2.inst.cfg new file mode 100644 index 0000000000..4a0e63f6ba --- /dev/null +++ b/resources/variants/creality_cr6se_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_cr6se_0.3.inst.cfg b/resources/variants/creality_cr6se_0.3.inst.cfg new file mode 100644 index 0000000000..cd311fb3e2 --- /dev/null +++ b/resources/variants/creality_cr6se_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_cr6se_0.4.inst.cfg b/resources/variants/creality_cr6se_0.4.inst.cfg new file mode 100644 index 0000000000..91173c9146 --- /dev/null +++ b/resources/variants/creality_cr6se_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_cr6se_0.5.inst.cfg b/resources/variants/creality_cr6se_0.5.inst.cfg new file mode 100644 index 0000000000..52f11ebd62 --- /dev/null +++ b/resources/variants/creality_cr6se_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_cr6se_0.6.inst.cfg b/resources/variants/creality_cr6se_0.6.inst.cfg new file mode 100644 index 0000000000..017aad1284 --- /dev/null +++ b/resources/variants/creality_cr6se_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_cr6se_0.8.inst.cfg b/resources/variants/creality_cr6se_0.8.inst.cfg new file mode 100644 index 0000000000..f0714ce894 --- /dev/null +++ b/resources/variants/creality_cr6se_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_cr6se_1.0.inst.cfg b/resources/variants/creality_cr6se_1.0.inst.cfg new file mode 100644 index 0000000000..cde843ff50 --- /dev/null +++ b/resources/variants/creality_cr6se_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = creality_cr6se + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0