diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 49ea10cf03..4c6f9148c3 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -366,11 +366,12 @@ class MaterialManager(QObject): # 1. the given machine doesn't have materials; # 2. cannot find any material InstanceContainers with the given settings. # - def getMaterialNodeByType(self, global_stack: "GlobalStack", extruder_variant_name: str, material_guid: str) -> Optional["MaterialNode"]: + def getMaterialNodeByType(self, global_stack: "GlobalStack", position: str, extruder_variant_name: str, material_guid: str) -> Optional["MaterialNode"]: node = None machine_definition = global_stack.definition + extruder_definition = global_stack.extruders[position].definition if parseBool(machine_definition.getMetaDataEntry("has_materials", False)): - material_diameter = machine_definition.getProperty("material_diameter", "value") + material_diameter = extruder_definition.getProperty("material_diameter", "value") if isinstance(material_diameter, SettingFunction): material_diameter = material_diameter(global_stack) @@ -413,11 +414,15 @@ class MaterialManager(QObject): else: return None - def getDefaultMaterial(self, global_stack: "GlobalStack", extruder_variant_name: Optional[str]) -> Optional["MaterialNode"]: + ## Get default material for given global stack, extruder position and extruder variant name + # you can provide the extruder_definition and then the position is ignored (useful when building up global stack in CuraStackBuilder) + def getDefaultMaterial(self, global_stack: "GlobalStack", position: str, extruder_variant_name: Optional[str], extruder_definition: Optional["ExtruderStack"] = None) -> Optional["MaterialNode"]: node = None machine_definition = global_stack.definition + if extruder_definition is None: + extruder_definition = global_stack.extruders[position].definition if parseBool(global_stack.getMetaDataEntry("has_materials", False)): - material_diameter = machine_definition.getProperty("material_diameter", "value") + material_diameter = extruder_definition.getProperty("material_diameter", "value") if isinstance(material_diameter, SettingFunction): material_diameter = material_diameter(global_stack) approximate_material_diameter = str(round(material_diameter)) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 85514006b5..e593c3d349 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -72,12 +72,6 @@ class CuraStackBuilder: ) new_global_stack.setName(generated_name) - # get material container for extruders - material_container = application.empty_material_container - material_node = material_manager.getDefaultMaterial(new_global_stack, extruder_variant_name) - if material_node and material_node.getContainer(): - material_container = material_node.getContainer() - # Create ExtruderStacks extruder_dict = machine_definition.getMetaDataEntry("machine_extruder_trains") @@ -90,6 +84,12 @@ class CuraStackBuilder: ConfigurationErrorMessage.getInstance().addFaultyContainers(extruder_definition_id) return None #Don't return any container stack then, not the rest of the extruders either. + # get material container for extruders + material_container = application.empty_material_container + material_node = material_manager.getDefaultMaterial(new_global_stack, position, extruder_variant_name, extruder_definition = extruder_definition) + if material_node and material_node.getContainer(): + material_container = material_node.getContainer() + new_extruder_id = registry.uniqueName(extruder_definition_id) new_extruder = cls.createExtruderStack( new_extruder_id, diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index a773bccc7e..e046082b5f 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -399,73 +399,22 @@ class ExtruderManager(QObject): extruder_train.setNextStack(global_stack) extruders_changed = True - self._fixMaterialDiameterAndNozzleSize(global_stack, extruder_trains) + self._fixSingleExtrusionMachineExtruderDefinition(global_stack) if extruders_changed: self.extrudersChanged.emit(global_stack_id) self.setActiveExtruderIndex(0) - # - # This function tries to fix the problem with per-extruder-settable nozzle size and material diameter problems - # in early versions (3.0 - 3.2.1). - # - # In earlier versions, "nozzle size" and "material diameter" are only applicable to the complete machine, so all - # extruders share the same values. In this case, "nozzle size" and "material diameter" are saved in the - # GlobalStack's DefinitionChanges container. - # - # Later, we could have different "nozzle size" for each extruder, but "material diameter" could only be set for - # the entire machine. In this case, "nozzle size" should be saved in each ExtruderStack's DefinitionChanges, but - # "material diameter" still remains in the GlobalStack's DefinitionChanges. - # - # Lateer, both "nozzle size" and "material diameter" are settable per-extruder, and both settings should be saved - # in the ExtruderStack's DefinitionChanges. - # - # There were some bugs in upgrade so the data weren't saved correct as described above. This function tries fix - # this. - # - # One more thing is about material diameter and single-extrusion machines. Most single-extrusion machines don't - # specifically define their extruder definition, so they reuse "fdmextruder", but for those machines, they may - # define "material diameter = 1.75" in their machine definition, but in "fdmextruder", it's still "2.85". This - # causes a problem with incorrect default values. - # - # This is also fixed here in this way: If no "material diameter" is specified, it will look for the default value - # in both the Extruder's definition and the Global's definition. If 2 values don't match, we will use the value - # from the Global definition by setting it in the Extruder's DefinitionChanges container. - # - def _fixMaterialDiameterAndNozzleSize(self, global_stack, extruder_stack_list): - keys_to_copy = ["material_diameter", "machine_nozzle_size"] # these will be copied over to all extruders - - extruder_positions_to_update = set() - for extruder_stack in extruder_stack_list: - for key in keys_to_copy: - # Only copy the value when this extruder doesn't have the value. - if extruder_stack.definitionChanges.hasProperty(key, "value"): - continue - - setting_value_in_global_def_changes = global_stack.definitionChanges.getProperty(key, "value") - setting_value_in_global_def = global_stack.definition.getProperty(key, "value") - setting_value = setting_value_in_global_def - if setting_value_in_global_def_changes is not None: - setting_value = setting_value_in_global_def_changes - if setting_value == extruder_stack.definition.getProperty(key, "value"): - continue - - setting_definition = global_stack.getSettingDefinition(key) - new_instance = SettingInstance(setting_definition, extruder_stack.definitionChanges) - new_instance.setProperty("value", setting_value) - new_instance.resetState() # Ensure that the state is not seen as a user state. - extruder_stack.definitionChanges.addInstance(new_instance) - extruder_stack.definitionChanges.setDirty(True) - - # Make sure the material diameter is up to date for the extruder stack. - if key == "material_diameter": - position = int(extruder_stack.getMetaDataEntry("position")) - extruder_positions_to_update.add(position) - - # We have to remove those settings here because we know that those values have been copied to all - # the extruders at this point. - for key in keys_to_copy: - if global_stack.definitionChanges.hasProperty(key, "value"): - global_stack.definitionChanges.removeInstance(key, postpone_emit = True) + # After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing + # "fdmextruder". We need to check a machine here so its extruder definition is correct according to this. + def _fixSingleExtrusionMachineExtruderDefinition(self, global_stack): + expected_extruder_definition_0_id = global_stack.getMetaDataEntry("machine_extruder_trains")["0"] + extruder_stack_0 = global_stack.extruders["0"] + if extruder_stack_0.definition.getId() != expected_extruder_definition_0_id: + Logger.log("e", "Single extruder printer [{printer}] expected extruder [{expected}], but got [{got}]. I'm making it [{expected}].".format( + printer = global_stack.getId(), expected = expected_extruder_definition_0_id, got = extruder_stack_0.definition.getId())) + container_registry = ContainerRegistry.getInstance() + extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0] + extruder_stack_0.definition = extruder_definition ## Get all extruder values for a certain setting. # diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index a088592b88..6d0aed8519 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1279,7 +1279,7 @@ class MachineManager(QObject): continue # The current material is not available, find the preferred one - material_node = self._material_manager.getDefaultMaterial(self._global_container_stack, current_variant_name) + material_node = self._material_manager.getDefaultMaterial(self._global_container_stack, position, current_variant_name) if material_node is not None: self._setMaterial(position_item, material_node) @@ -1321,7 +1321,7 @@ class MachineManager(QObject): for extruder_configuration in configuration.extruderConfigurations: position = str(extruder_configuration.position) variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), extruder_configuration.hotendID) - material_container_node = self._material_manager.getMaterialNodeByType(self._global_container_stack, extruder_configuration.hotendID,extruder_configuration.material.guid) + material_container_node = self._material_manager.getMaterialNodeByType(self._global_container_stack, position, extruder_configuration.hotendID, extruder_configuration.material.guid) if variant_container_node: self._setVariantNode(position, variant_container_node) else: diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index 4c459e69cf..acfec7938d 100755 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -129,6 +129,7 @@ class MachineSettingsAction(MachineAction): return machine_manager = self._application.getMachineManager() + material_manager = self._application.getMaterialManager() extruder_positions = list(self._global_container_stack.extruders.keys()) has_materials = self._global_container_stack.getProperty("machine_gcode_flavor", "value") != "UltiGCode" @@ -138,11 +139,6 @@ class MachineSettingsAction(MachineAction): self._global_container_stack.setMetaDataEntry("has_materials", True) else: self._global_container_stack.addMetaDataEntry("has_materials", True) - - # Set the material container for each extruder to a sane default - material_manager = self._application.getMaterialManager() - material_node = material_manager.getDefaultMaterial(self._global_container_stack, None) - else: # The metadata entry is stored in an ini, and ini files are parsed as strings only. # Because any non-empty string evaluates to a boolean True, we have to remove the entry to make it False. @@ -151,6 +147,8 @@ class MachineSettingsAction(MachineAction): # set materials for position in extruder_positions: + if has_materials: + material_node = material_manager.getDefaultMaterial(self._global_container_stack, position, None) machine_manager.setMaterial(position, material_node) self._application.globalContainerStackChanged.emit() diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index 9a371106bd..a3ce3354af 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "platform": "101hero-platform.stl", "supports_usb_connection": true, - "preferred_quality_type": "draft" + "preferred_quality_type": "draft", + "machine_extruder_trains": + { + "0": "101Hero_extruder_0" + } }, "overrides": { @@ -21,7 +25,6 @@ "machine_height": { "default_value": 99.822 }, "machine_center_is_zero": { "default_value": true }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [ [ 0, 0 ], diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index 19307bfddd..91d058cd4e 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "supports_usb_connection": true, - "platform": "3dator_platform.stl" + "platform": "3dator_platform.stl", + "machine_extruder_trains": + { + "0": "3dator_extruder_0" + } }, "overrides": { @@ -30,7 +34,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 170 }, "machine_width": { "default_value": 180 }, - "material_diameter": { "default_value": 1.75 }, "retraction_speed": {"default_value":100}, "cool_fan_speed_min": {"default_value": 20}, "cool_fan_speed_max": {"default_value": 70}, diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 2fa648096f..1ab48b865a 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "ABAX 3d Technologies", "manufacturer": "ABAX 3d Technologies", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "abax_pri3_extruder_0" + } }, "overrides": { "machine_start_gcode": { @@ -54,9 +58,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index cbebb576b0..46229ce756 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "ABAX 3d Technologies", "manufacturer": "ABAX 3d Technologies", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "abax_pri5_extruder_0" + } }, "overrides": { "machine_start_gcode": { @@ -54,9 +58,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index 5f7a99d64d..9f67117d6c 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "ABAX 3d Technologies", "manufacturer": "ABAX 3d Technologies", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "abax_titan_extruder_0" + } }, "overrides": { "machine_start_gcode": { @@ -54,9 +58,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 6bf5d89a95..f51edfe06d 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "ALYA", "manufacturer": "ALYA", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "alya3dp_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index 7106038193..f20fb68da2 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -12,7 +12,11 @@ "platform": "anycubic_i3_mega_platform.stl", "has_materials": false, "has_machine_quality": true, - "preferred_quality_type": "normal" + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "anycubic_i3_mega_extruder_0" + } }, "overrides": @@ -45,10 +49,6 @@ { "default_value": 0.4 }, - "material_diameter": - { - "default_value": 1.75 - }, "gantry_height": { "default_value": 0 diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index 7a76e231a8..aa183f9c0a 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "BFB", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "bfb_extruder_0" + } }, "overrides": { @@ -23,7 +27,6 @@ "machine_gcode_flavor": { "default_value": "BFB" }, "machine_depth": { "default_value": 265 }, "speed_infill": { "default_value": 30 }, - "material_diameter": { "default_value": 1.7 }, "machine_center_is_zero": { "default_value": true }, "machine_height": { "default_value": 240 }, "layer_height": { "default_value": 0.25 }, diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json index 0fb40a4741..8dc67a8cad 100644 --- a/resources/definitions/bq_hephestos.def.json +++ b/resources/definitions/bq_hephestos.def.json @@ -8,7 +8,11 @@ "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_hephestos_platform.stl", - "platform_offset": [ 0, -82, 0] + "platform_offset": [ 0, -82, 0], + "machine_extruder_trains": + { + "0": "bq_hephestos_extruder_0" + } }, "overrides": { @@ -58,9 +62,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index a3493334b6..ca0e66ada2 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -8,7 +8,11 @@ "manufacturer": "BQ", "platform": "bq_hephestos_2_platform.stl", "platform_offset": [6, 1320, 0 ], - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "bq_hephestos_2_extruder_0" + } }, "overrides": { @@ -22,7 +26,6 @@ "machine_center_is_zero": { "default_value": false }, "material_print_temperature": { "default_value": 210 }, "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, "wall_line_count": { "default_value": 3 }, diff --git a/resources/definitions/bq_hephestos_xl.def.json b/resources/definitions/bq_hephestos_xl.def.json index 08be4b8d34..a8d63cbb41 100644 --- a/resources/definitions/bq_hephestos_xl.def.json +++ b/resources/definitions/bq_hephestos_xl.def.json @@ -8,7 +8,11 @@ "author": "BQ", "file_formats": "text/x-gcode", "platform": "bq_hephestos_platform.stl", - "platform_offset": [ 0, -82, 0] + "platform_offset": [ 0, -82, 0], + "machine_extruder_trains": + { + "0": "bq_hephestos_xl_extruder_0" + } }, "overrides": { @@ -58,9 +62,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json index ef4e12b704..0ae1c5e339 100644 --- a/resources/definitions/bq_witbox.def.json +++ b/resources/definitions/bq_witbox.def.json @@ -8,7 +8,11 @@ "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_witbox_platform.stl", - "platform_offset": [ 0, -145, -38] + "platform_offset": [ 0, -145, -38], + "machine_extruder_trains": + { + "0": "bq_witbox_extruder_0" + } }, "overrides": { @@ -58,9 +62,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index ab3786ad1f..7412647852 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -8,7 +8,11 @@ "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_witbox_platform.stl", - "platform_offset": [0, -145, -38] + "platform_offset": [0, -145, -38], + "machine_extruder_trains": + { + "0": "bq_witbox_2_extruder_0" + } }, "overrides": { @@ -43,9 +47,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index deb1539a9a..155ce8e962 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -26,7 +26,6 @@ "machine_width": { "default_value": 215 }, "machine_height": { "default_value": 600 }, "machine_depth": { "default_value": 205 }, - "material_diameter": { "default_value": 1.75 }, "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index c28c7c5de6..c390c3719b 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -26,7 +26,6 @@ "machine_width": { "default_value": 215 }, "machine_height": { "default_value": 400 }, "machine_depth": { "default_value": 205 }, - "material_diameter": { "default_value": 1.75 }, "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 8e2fe44631..ec7bf0a345 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -25,7 +25,6 @@ "machine_width": { "default_value": 215 }, "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 205 }, - "material_diameter": { "default_value": 1.75 }, "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 5ca891d6c5..d2b7242d8c 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -34,7 +34,6 @@ "overrides": { "machine_extruder_count": { "default_value": 2 }, - "material_diameter": { "default_value": 1.75 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "gantry_height": { "default_value": 35 }, diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index eb0b8c7306..9fbceec9aa 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -7,7 +7,11 @@ "author": "Michael Wildermuth", "manufacturer": "Creality3D", "file_formats": "text/x-gcode", - "preferred_quality_type": "draft" + "preferred_quality_type": "draft", + "machine_extruder_trains": + { + "0": "creality_cr10_extruder_0" + } }, "overrides": { "machine_width": { @@ -27,9 +31,6 @@ [30, 34] ] }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/creality_cr10s4.def.json b/resources/definitions/creality_cr10s4.def.json index cebe255705..7145083674 100644 --- a/resources/definitions/creality_cr10s4.def.json +++ b/resources/definitions/creality_cr10s4.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "Michael Wildermuth", "manufacturer": "Creality3D", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "creality_cr10s4_extruder_0" + } }, "overrides": { "machine_width": { diff --git a/resources/definitions/creality_cr10s5.def.json b/resources/definitions/creality_cr10s5.def.json index e6aaa88b04..b082894a16 100644 --- a/resources/definitions/creality_cr10s5.def.json +++ b/resources/definitions/creality_cr10s5.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "Michael Wildermuth", "manufacturer": "Creality3D", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "creality_cr10s5_extruder_0" + } }, "overrides": { "machine_width": { diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 4f0fddc41d..9ee4707ff1 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -8,7 +8,11 @@ "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "discoeasy200.stl", - "platform_offset": [ 105, -59, 280] + "platform_offset": [ 105, -59, 280], + "machine_extruder_trains": + { + "0": "dagoma_discoeasy200_extruder_0" + } }, "overrides": { "machine_width": { @@ -43,9 +47,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n" }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 21a557ac22..c95b2c3103 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -9,7 +9,11 @@ "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "neva.stl", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "dagoma_neva_extruder_0" + } }, "overrides": { "machine_width": { @@ -50,9 +54,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index a6d75b2983..968bf281a5 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -1,40 +1,43 @@ -{ - "name": "Delta Go", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Deltaprintr", - "manufacturer": "Deltaprintr", - "file_formats": "text/x-gcode", - "platform_offset": [0, 0, 0], - "platform": "" - }, - "overrides": { - "machine_name": { "default_value": "Delta Go" }, - "material_diameter": { "default_value": 1.75 }, - "default_material_print_temperature": { "default_value": 210 }, - "speed_travel": { "default_value": 150 }, - "prime_tower_size": { "default_value": 8.66 }, - "infill_sparse_density": { "default_value": 10 }, - "speed_wall_x": { "default_value": 30 }, - "speed_wall_0": { "default_value": 30 }, - "speed_topbottom": { "default_value": 20 }, - "layer_height": { "default_value": 0.15 }, - "speed_print": { "default_value": 30 }, - "machine_heated_bed": { "default_value": false }, - "machine_center_is_zero": { "default_value": true }, - "machine_height": { "default_value": 154 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_depth": { "default_value": 115 }, - "machine_width": { "default_value": 115 }, - "raft_airgap": { "default_value": 0.15 }, - "retraction_hop_enabled": { "value": "True" }, - "retraction_amount": { "default_value": 4.1 }, - "retraction_speed": { "default_value": 500 }, - "retraction_hop": { "value": "0.2" }, - "retraction_hop_only_when_collides": { "value": "True" }, - "brim_width": { "value": "5" }, - "machine_shape": { "default_value": "elliptic"} - } -} +{ + "name": "Delta Go", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Deltaprintr", + "manufacturer": "Deltaprintr", + "file_formats": "text/x-gcode", + "platform_offset": [0, 0, 0], + "platform": "", + "machine_extruder_trains": + { + "0": "delta_go_extruder_0" + } + }, + "overrides": { + "machine_name": { "default_value": "Delta Go" }, + "default_material_print_temperature": { "default_value": 210 }, + "speed_travel": { "default_value": 150 }, + "prime_tower_size": { "default_value": 8.66 }, + "infill_sparse_density": { "default_value": 10 }, + "speed_wall_x": { "default_value": 30 }, + "speed_wall_0": { "default_value": 30 }, + "speed_topbottom": { "default_value": 20 }, + "layer_height": { "default_value": 0.15 }, + "speed_print": { "default_value": 30 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": true }, + "machine_height": { "default_value": 154 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_depth": { "default_value": 115 }, + "machine_width": { "default_value": 115 }, + "raft_airgap": { "default_value": 0.15 }, + "retraction_hop_enabled": { "value": "True" }, + "retraction_amount": { "default_value": 4.1 }, + "retraction_speed": { "default_value": 500 }, + "retraction_hop": { "value": "0.2" }, + "retraction_hop_only_when_collides": { "value": "True" }, + "brim_width": { "value": "5" }, + "machine_shape": { "default_value": "elliptic"} + } +} diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index e3b676d0ec..1746eef920 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Danny Lu", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "deltabot_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index 0fdf61e582..c678571c57 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -10,7 +10,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "deltacomb.stl", - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": + { + "0": "deltacomb_extruder_0" + } }, "overrides": { @@ -20,7 +24,6 @@ "machine_depth": { "default_value": 190 }, "machine_center_is_zero": { "default_value": true }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "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 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."}, "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, @@ -28,7 +31,6 @@ "retraction_hop_enabled": { "default_value": true }, "retraction_amount" : { "default_value": 3.5 }, "retraction_speed" : { "default_value": 50 }, - "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index 689ac63625..4f1d63b346 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "nliaudat", "manufacturer": "EasyArts (discontinued)", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "easyarts_ares_extruder_0" + } }, "overrides": { "machine_start_gcode": { @@ -48,9 +52,6 @@ "bottom_thickness": { "default_value": 1 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index d66de07c4a..0b9b768866 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -1,70 +1,72 @@ { - "version": 2, - "name": "FABtotum Personal Fabricator", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "FABtotum", - "manufacturer": "FABtotum", - "category": "Other", - "file_formats": "text/x-gcode", - "platform": "fabtotum_platform.stl", - "icon": "fabtotum_platform.png", - "has_machine_quality": true, - "has_variants": true, - "variants_name": "Head", - "preferred_variant_name": "Lite 0.4 mm", - "preferred_material": "fabtotum_pla", - "supports_usb_connection": false - }, - - "overrides": { - "machine_name": { "default_value": "FABtotum Personal Fabricator" }, - "machine_start_gcode": { - "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print" + "version": 2, + "name": "FABtotum Personal Fabricator", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "FABtotum", + "manufacturer": "FABtotum", + "category": "Other", + "file_formats": "text/x-gcode", + "platform": "fabtotum_platform.stl", + "icon": "fabtotum_platform.png", + "has_machine_quality": true, + "has_variants": true, + "variants_name": "Head", + "preferred_variant_name": "Lite 0.4 mm", + "preferred_material": "fabtotum_pla", + "supports_usb_connection": false, + "machine_extruder_trains": + { + "0": "fabtotum_extruder_0" + } }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" - }, - "gantry_height": { "default_value": 55 }, - "machine_width": { "default_value": 214 }, - "machine_height": { "default_value": 241.5 }, - "machine_depth": { "default_value": 234 }, - "machine_center_is_zero": { "default_value": false }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 250 }, - "machine_max_feedrate_z": { "default_value": 15 }, - "machine_max_acceleration_x": { "default_value": 10000 }, - "machine_max_acceleration_y": { "default_value": 10000 }, - "machine_max_acceleration_z": { "default_value": 50 }, - "machine_max_acceleration_e": { "default_value": 100 }, - "machine_acceleration": { "default_value": 4000 }, - "machine_max_jerk_xy": { "default_value": 25.0 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 1.0 }, - "retraction_hop_enabled": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature - 5" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "travel_avoid_distance": { "default_value": 1, "value": 1 }, - "speed_travel": { "default_value": 200, "value": 200 }, - "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, - "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, - "speed_wall": { "value": "speed_print" }, - "speed_wall_0": { "value": "round(speed_print * 0.9, 0)" }, - "speed_wall_x": { "value": "speed_wall" }, - "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, - "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "skirt_line_count": { "default_value": 3 }, - "skirt_brim_minimal_length": { "default_value": 150 }, - "infill_sparse_density": { "default_value": 24 }, - "top_bottom_thickness": { "default_value": 0.6 }, - "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" }, - "support_interface_enable": { "default_value": true } - } + "overrides": { + "machine_name": { "default_value": "FABtotum Personal Fabricator" }, + "machine_start_gcode": { + "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" + }, + "gantry_height": { "default_value": 55 }, + "machine_width": { "default_value": 214 }, + "machine_height": { "default_value": 241.5 }, + "machine_depth": { "default_value": 234 }, + "machine_center_is_zero": { "default_value": false }, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 250 }, + "machine_max_feedrate_z": { "default_value": 15 }, + "machine_max_acceleration_x": { "default_value": 10000 }, + "machine_max_acceleration_y": { "default_value": 10000 }, + "machine_max_acceleration_z": { "default_value": 50 }, + "machine_max_acceleration_e": { "default_value": 100 }, + "machine_acceleration": { "default_value": 4000 }, + "machine_max_jerk_xy": { "default_value": 25.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 1.0 }, + "retraction_hop_enabled": { "default_value": false }, + "material_final_print_temperature": { "value": "material_print_temperature - 5" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "travel_avoid_distance": { "default_value": 1, "value": 1 }, + "speed_travel": { "default_value": 200, "value": 200 }, + "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, + "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_0": { "value": "round(speed_print * 0.9, 0)" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, + "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_line_count": { "default_value": 3 }, + "skirt_brim_minimal_length": { "default_value": 150 }, + "infill_sparse_density": { "default_value": 24 }, + "top_bottom_thickness": { "default_value": 0.6 }, + "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" }, + "support_interface_enable": { "default_value": true } + } } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e1b3a5ff6d..b458316686 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2108,20 +2108,6 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, - "material_diameter": - { - "label": "Diameter", - "description": "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament.", - "unit": "mm", - "type": "float", - "default_value": 2.85, - "minimum_value": "0.0001", - "minimum_value_warning": "0.4", - "maximum_value_warning": "3.5", - "enabled": "machine_gcode_flavor != \"UltiGCode\"", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "material_adhesion_tendency": { "label": "Adhesion Tendency", diff --git a/resources/definitions/felixtec4dual.def.json b/resources/definitions/felixtec4dual.def.json index 9747fc74d9..b56601a531 100644 --- a/resources/definitions/felixtec4dual.def.json +++ b/resources/definitions/felixtec4dual.def.json @@ -48,7 +48,6 @@ "adhesion_type": { "default_value": "skirt" }, "skirt_brim_minimal_length": { "default_value": 130}, - "material_diameter": { "default_value": 1.75 }, "machine_start_gcode": { "default_value": "; FELIXprinters | www.FELIXprinters.com | Zeemanlaan 15 3401 MV IJsselstein The Netherlands\n; FELIX Tec 4 | Start Code Dual Extruders v1.0\n; Modified by kerog777@gmail.com\n;================================ \n;Initializing\nM80 ; Turn on the power supply\nM107 ; Turn off fans\nM117 Heating up\nM104 T0 S120\nM104 T1 S120\nM140 S{print_bed_temperature} ; Heatup Bed and continue\nG28 ; Home all\nM109 T0 S{print_temperature} ; Heatup hot-end and continue\nM117 Purging\nT0 ; Select extruder 1\nG92 E0 ; Reset extruder\nG1 X10.0 Y1.1 Z5.0 F15240 ; Move to start-line position\nG1 Z0.3 F15240 ; Move z up\nG1 X127.0 Y1.1 Z0.3 F1500.0 E15 ; Purge 1st line\nG92 E0 ; Reset extruder\n\n;================================ ; Initializing done\nM117 FELIXprinting" }, diff --git a/resources/definitions/folgertech_FT-5.def.json b/resources/definitions/folgertech_FT-5.def.json index 71c6987a1a..d3d00a9b25 100644 --- a/resources/definitions/folgertech_FT-5.def.json +++ b/resources/definitions/folgertech_FT-5.def.json @@ -7,14 +7,17 @@ "author": "Jaime van Kessel & Paul Bussiere", "manufacturer": "Folger Tech", "file_formats": "text/x-gcode", - "platform": "FT-5_build_plate.stl" + "platform": "FT-5_build_plate.stl", + "machine_extruder_trains": + { + "0": "folgertech_FT-5_extruder_0" + } }, "overrides": { "machine_heated_bed": { "default_value": true }, "machine_width": { "default_value": 300 }, "machine_height": { "default_value": 400 }, "machine_depth": { "default_value": 300 }, - "material_diameter": { "default_value": 1.75 }, "gantry_height": { "default_value": 55 }, "machine_start_gcode": { diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index 897d492bb2..d112c62fe8 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -12,8 +12,11 @@ "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "has_machine_quality": true, "has_variants": true, - "variants_name": "Hotend", - "preferred_variant_name": "0.5mm E3D (Default)" + "variants_name": "Hotend", + "preferred_variant_name": "0.5mm E3D (Default)", + "machine_extruder_trains": { + "0": "gmax15plus_extruder_0" + } }, "overrides": { @@ -24,7 +27,6 @@ "machine_depth": { "default_value": 406 }, "machine_height": { "default_value": 533 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.5 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index 8c57c8af63..6b70dd2eb1 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -28,7 +28,6 @@ "machine_depth": { "default_value": 406 }, "machine_height": { "default_value": 533 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.5 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json index 847f638fbd..374fae2202 100644 --- a/resources/definitions/grr_neo.def.json +++ b/resources/definitions/grr_neo.def.json @@ -8,7 +8,11 @@ "manufacturer": "German RepRap", "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", - "platform": "grr_neo_platform.stl" + "platform": "grr_neo_platform.stl", + "machine_extruder_trains": + { + "0": "grr_neo_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 2699a6c7d7..65716ac175 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -28,7 +28,6 @@ "machine_center_is_zero": { "default_value": false }, "material_print_temperature": { "default_value": 200 }, "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { "default_value": 1.75 }, "line_width": { "default_value": 0.48 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index b234e4b2cd..1fcea7620a 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -14,7 +14,10 @@ "has_materials": true, "has_variants": true, "has_machine_materials": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "imade3d_jellybox_extruder_0" + } }, "overrides": { @@ -24,7 +27,6 @@ "machine_height": { "default_value": 145 }, "machine_depth": { "default_value": 160 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 5d587f9b30..8b14e9a73f 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -8,7 +8,11 @@ "manufacturer": "Innovo", "file_formats": "text/x-gcode", "platform": "inventor_platform.stl", - "platform_offset": [-180, -0.25, 160] + "platform_offset": [-180, -0.25, 160], + "machine_extruder_trains": + { + "0": "innovo_inventor_extruder_0" + } }, "overrides": { @@ -66,9 +70,6 @@ "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 50 }, diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index 7fdee30272..62e4170c1f 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Fracktal", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "julia_extruder_0" + } }, "overrides": { @@ -28,7 +32,6 @@ "brim_line_count": { "default_value": 15 }, "skin_overlap": { "default_value": 30 }, "prime_tower_size": { "default_value": 8.660254037844387 }, - "material_diameter": { "default_value": 1.75 }, "bottom_thickness": { "default_value": 0.8 }, "retraction_amount": { "default_value": 3 }, "speed_topbottom": { "default_value": 80 }, diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 7946fbfad2..1a4bac233b 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "platform": "kemiq_q2.stl", "has_machine_quality": true, - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "kemiq_q2_beta_extruder_0" + } }, "overrides": { @@ -30,9 +34,6 @@ "machine_center_is_zero": { "default_value": false }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index 64051606f2..341efaa7c5 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "platform": "kemiq_q2.stl", "has_machine_quality": true, - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "kemiq_q2_gama_extruder_0" + } }, "overrides": { @@ -31,9 +35,6 @@ "machine_center_is_zero": { "default_value": false }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index df9c29b548..b4b2e5b78f 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "kossel_platform.stl", - "platform_offset": [0, -0.25, 0] + "platform_offset": [0, -0.25, 0], + "machine_extruder_trains": + { + "0": "kossel_mini_extruder_0" + } }, "overrides": { @@ -31,9 +35,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index fa0cb571fa..c966a9ff65 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "kossel_pro_build_platform.stl", - "platform_offset": [0, -0.25, 0] + "platform_offset": [0, -0.25, 0], + "machine_extruder_trains": + { + "0": "kossel_pro_extruder_0" + } }, "overrides": { "machine_heated_bed": { @@ -30,9 +34,6 @@ "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index b16ba62ccc..412fe979b8 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Kupido", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "kupido_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index fb5a7dce75..68cad7f7b9 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "makeR_pegasus_platform.stl", - "platform_offset": [-200, -10, 200] + "platform_offset": [-200, -10, 200], + "machine_extruder_trains": + { + "0": "makeR_pegasus_extruder_0" + } }, "overrides": { @@ -32,9 +36,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 2.85 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index a82fffd254..6cf0e40619 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "makeR_prusa_tairona_i3_platform.stl", - "platform_offset": [-2, 0, 0] + "platform_offset": [-2, 0, 0], + "machine_extruder_trains": + { + "0": "makeR_prusa_tairona_i3_extruder_0" + } }, "overrides": { @@ -32,9 +36,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 2a64a6729c..41b351b47a 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -69,9 +69,6 @@ "prime_tower_position_y": { "value": "160" }, - "material_diameter": { - "default_value": 1.75 - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 43a5440165..798bb03318 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -69,9 +69,6 @@ "prime_tower_position_y": { "value": "160" }, - "material_diameter": { - "default_value": 1.75 - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index de0267dc8e..333dd6c8bf 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj", "icon": "icon_ultimaker2.png", "platform": "makerstarter_platform.stl", - "preferred_quality_type": "draft" + "preferred_quality_type": "draft", + "machine_extruder_trains": + { + "0": "maker_starter_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 3d690990ce..1770b7a979 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -7,14 +7,17 @@ "author": "Ultimaker", "manufacturer": "MakerBot", "file_formats": "application/x3g", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "makerbotreplicator_extruder_0" + } }, "overrides": { "prime_tower_size": { "default_value": 10.0 }, "infill_sparse_density": { "default_value": 10 }, "speed_travel": { "default_value": 150 }, - "material_diameter": { "default_value": 1.75 }, "layer_height": { "default_value": 0.15 }, "material_print_temperature": { "default_value": 220 }, "machine_extruder_count": { "default_value": 1 }, diff --git a/resources/definitions/malyan_m180.def.json b/resources/definitions/malyan_m180.def.json index c74317a633..65e573cdb3 100644 --- a/resources/definitions/malyan_m180.def.json +++ b/resources/definitions/malyan_m180.def.json @@ -8,7 +8,11 @@ "author": "Ruben Dulek", "manufacturer": "Malyan", "machine_x3g_variant": "r1d", - "file_formats": "application/x3g" + "file_formats": "application/x3g", + "machine_extruder_trains": + { + "0": "malyan_m180_extruder_0" + } }, "overrides": { @@ -62,11 +66,6 @@ }, "machine_end_gcode": { "default_value": "G92 Z0\nG1 Z10 F400\nM18\nM109 S0 T0\nM104 S0 T0\nM73 P100 (end build progress)\nG162 X Y F3000\nM18" - }, - "material_diameter": { - "default_value": 1.75, - "minimum_value_warning": "1.5", - "maximum_value_warning": "2.0" } } -} \ No newline at end of file +} diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index ec3237a7e6..df852273f6 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -15,7 +15,11 @@ "supports_usb_connection": true, "visible": true, "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] + "supported_actions": ["MachineSettingsAction"], + "machine_extruder_trains": + { + "0": "malyan_m200_extruder_0" + } }, "overrides": { @@ -56,7 +60,6 @@ "machine_height": { "default_value": 120 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4, "minimum_value": 0.15 diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index 15ba889efc..bf21eb17ca 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -7,7 +7,11 @@ "author": "RBC", "manufacturer": "Mankati", "file_formats": "text/x-gcode", - "platform": "mankati_fullscale_xt_plus_platform.stl" + "platform": "mankati_fullscale_xt_plus_platform.stl", + "machine_extruder_trains": + { + "0": "mankati_fullscale_xt_plus_extruder_0" + } }, "overrides": { "machine_name": { "default_value": "Mankati Fullscale XT Plus" }, @@ -40,7 +44,6 @@ "top_bottom_thickness": { "default_value": 0.3 }, "material_print_temperature": { "default_value": 195 }, "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { "default_value": 1.75 }, "retraction_enable": { "default_value": true }, "retraction_speed": { "default_value": 50 }, "retraction_amount": { "default_value": 0.8 }, diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 95f47d7aac..6974ae5bf7 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -1,87 +1,88 @@ -{ - "name": "Mendel90", - "version": 2, - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "Bo Herrmannsen", - "manufacturer": "Nophead", - "file_formats": "text/x-gcode", - "platform": "mendel90_platform.stl", - "platform_offset": [0, -23.6, 0] - }, - - "pages": [ - "BedLeveling" - ], - - "overrides": { - "machine_name": { "default_value": "Mendel90" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\nM107 ;start with the fan off\nG1 X90 Y200 F6000 ;go to the middle of the front\nG1 Z0.05 ;close to the bed\nG1 Z0.3 ;lift Z\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Y200 F5000 ;Move Y to middle of bed cooling fan\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S420 ;Wait 7 mins\nM42 P42 S0 ;Turn off bed cooling fan\nG1 Y10 F5000 ;Move Y to front\nM84 ;steppers off\n" - }, - "material_bed_temp_wait": { - "default_value": true - }, - "material_print_temp_prepend": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 1 - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_nozzle_expansion_angle": { - "default_value": 45 - }, - "machine_heat_zone_length": { - "default_value": 16 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "gantry_height": { - "default_value": 55 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [ -12, 9 ], - [ -12, -9 ], - [ 14, 9 ], - [ 14, -9 ] - ] - } - } -} - - +{ + "name": "Mendel90", + "version": 2, + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Bo Herrmannsen", + "manufacturer": "Nophead", + "file_formats": "text/x-gcode", + "platform": "mendel90_platform.stl", + "platform_offset": [0, -23.6, 0], + "machine_extruder_trains": + { + "0": "mendel90_extruder_0" + } + }, + + "pages": [ + "BedLeveling" + ], + + "overrides": { + "machine_name": { "default_value": "Mendel90" }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\nM107 ;start with the fan off\nG1 X90 Y200 F6000 ;go to the middle of the front\nG1 Z0.05 ;close to the bed\nG1 Z0.3 ;lift Z\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Y200 F5000 ;Move Y to middle of bed cooling fan\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S420 ;Wait 7 mins\nM42 P42 S0 ;Turn off bed cooling fan\nG1 Y10 F5000 ;Move Y to front\nM84 ;steppers off\n" + }, + "material_bed_temp_wait": { + "default_value": true + }, + "material_print_temp_prepend": { + "default_value": true + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 1 + }, + "machine_nozzle_head_distance": { + "default_value": 5 + }, + "machine_nozzle_expansion_angle": { + "default_value": 45 + }, + "machine_heat_zone_length": { + "default_value": 16 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "gantry_height": { + "default_value": 55 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -12, 9 ], + [ -12, -9 ], + [ 14, 9 ], + [ 14, -9 ] + ] + } + } +} + + diff --git a/resources/definitions/monoprice_select_mini_v1.def.json b/resources/definitions/monoprice_select_mini_v1.def.json index 7264f0a6fc..a516d54b18 100644 --- a/resources/definitions/monoprice_select_mini_v1.def.json +++ b/resources/definitions/monoprice_select_mini_v1.def.json @@ -9,7 +9,11 @@ "category": "Other", "file_formats": "text/x-gcode", "quality_definition": "malyan_m200", - "visible": true + "visible": true, + "machine_extruder_trains": + { + "0": "monoprice_select_mini_v1_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/monoprice_select_mini_v2.def.json b/resources/definitions/monoprice_select_mini_v2.def.json index 99bb7ef50a..4e3d63044e 100644 --- a/resources/definitions/monoprice_select_mini_v2.def.json +++ b/resources/definitions/monoprice_select_mini_v2.def.json @@ -11,7 +11,11 @@ "has_machine_quality": true, "has_materials": true, "preferred_quality_type": "normal", - "visible": true + "visible": true, + "machine_extruder_trains": + { + "0": "monoprice_select_mini_v2_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index 3238583ceb..c589114fb6 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -23,7 +23,6 @@ "prime_tower_size": { "default_value": 7.0710678118654755 }, "infill_sparse_density": { "default_value": 15 }, "speed_travel": { "default_value": 150 }, - "material_diameter": { "default_value": 1.75 }, "layer_height": { "default_value": 0.3 }, "machine_nozzle_size": { "default_value": 0.35 }, "material_print_temperature": { "default_value": 240 }, diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 5a3cbddd14..1a31257523 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -8,7 +8,11 @@ "manufacturer": "Peopoly", "file_formats": "text/x-gcode", "has_machine_quality": true, - "has_materials": false + "has_materials": false, + "machine_extruder_trains": + { + "0": "peopoly_moai_extruder_0" + } }, "overrides": { @@ -134,10 +138,6 @@ "material_bed_temperature": { "enabled": false }, - "material_diameter": { - "enabled": false, - "default_value": 1.75 - }, "cool_fan_enabled": { "enabled": false, "value": "False" diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index 36ef93e60c..990f5b9080 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -7,7 +7,11 @@ "author": "Chris Pearson", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", - "platform": "printrbot_play.stl" + "platform": "printrbot_play.stl", + "machine_extruder_trains": + { + "0": "printrbot_play_extruder_0" + } }, "overrides": { @@ -17,7 +21,6 @@ "machine_depth": { "default_value": 100 }, "machine_height": { "default_value": 130 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, diff --git a/resources/definitions/printrbot_play_heated.def.json b/resources/definitions/printrbot_play_heated.def.json index 9ca365a5c0..680496bf56 100644 --- a/resources/definitions/printrbot_play_heated.def.json +++ b/resources/definitions/printrbot_play_heated.def.json @@ -7,7 +7,11 @@ "author": "Chris Pearson", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", - "platform": "" + "platform": "", + "machine_extruder_trains": + { + "0": "printrbot_play_heated_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/printrbot_simple.def.json b/resources/definitions/printrbot_simple.def.json index e56a9d8647..b20168deff 100644 --- a/resources/definitions/printrbot_simple.def.json +++ b/resources/definitions/printrbot_simple.def.json @@ -8,7 +8,11 @@ "manufacturer": "PrintrBot", "platform": "printrbot_simple_metal_platform.stl", "platform_offset": [0, -3.45, 0], - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "printrbot_simple_extruder_0" + } }, "overrides": { @@ -19,7 +23,6 @@ "machine_depth": { "default_value": 140 }, "machine_center_is_zero": { "default_value": false }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [ [-49, 20], diff --git a/resources/definitions/printrbot_simple_extended.def.json b/resources/definitions/printrbot_simple_extended.def.json index 95395efb23..02c58171c1 100644 --- a/resources/definitions/printrbot_simple_extended.def.json +++ b/resources/definitions/printrbot_simple_extended.def.json @@ -8,7 +8,11 @@ "manufacturer": "PrintrBot", "platform": "printrbot_simple_metal_upgrade.stl", "platform_offset": [0, -0.3, 0], - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "printrbot_simple_extended_extruder_0" + } }, "overrides": { @@ -19,7 +23,6 @@ "machine_depth": { "default_value": 150 }, "machine_center_is_zero": { "default_value": false }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [ [ 55, -20 ], diff --git a/resources/definitions/printrbot_simple_makers_kit.def.json b/resources/definitions/printrbot_simple_makers_kit.def.json index e2afd57826..001ee887f3 100644 --- a/resources/definitions/printrbot_simple_makers_kit.def.json +++ b/resources/definitions/printrbot_simple_makers_kit.def.json @@ -6,7 +6,11 @@ "visible": true, "author": "Timur Tabi", "manufacturer": "Printrbot", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "printrbot_simple_makers_kit_extruder_0" + } }, "overrides": { @@ -15,7 +19,6 @@ "machine_width": { "default_value": 100 }, "machine_depth": { "default_value": 100 }, "machine_height": { "default_value": 115 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_head_with_fans_polygon": { "default_value": [ diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 4599763397..603b2822f0 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -8,7 +8,11 @@ "manufacturer": "Prusajr", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "prusai3_platform.stl" + "platform": "prusai3_platform.stl", + "machine_extruder_trains": + { + "0": "prusa_i3_extruder_0" + } }, "overrides": { @@ -31,9 +35,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index e58eb4d903..033fbc6a48 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "prusai3_platform.stl", - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "prusa_i3_mk2_extruder_0" + } }, "overrides": { @@ -19,7 +23,6 @@ "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 210 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "material_bed_temperature": { "default_value": 55 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height": { "default_value": 0.1 }, diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index b27c460554..b1233f6df7 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -8,7 +8,11 @@ "manufacturer": "Prusajr", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", - "platform": "prusai3_xl_platform.stl" + "platform": "prusai3_xl_platform.stl", + "machine_extruder_trains": + { + "0": "prusa_i3_xl_extruder_0" + } }, "overrides": { @@ -31,9 +35,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index 02d3562b41..1efdd226fd 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -21,7 +21,6 @@ "prime_tower_size": { "default_value": 8.660254037844387 }, "speed_wall_x": { "default_value": 40 }, "speed_wall_0": { "default_value": 40 }, - "material_diameter": { "default_value": 1.75 }, "speed_topbottom": { "default_value": 40 }, "layer_height": { "default_value": 0.2 }, "material_print_temperature": { "default_value": 195 }, diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index fe0a2bf3b8..ea5a998a5a 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -54,9 +54,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index bddb2587e2..78a91d0f96 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -54,9 +54,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index ffcb723a27..25a263ab5f 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -8,7 +8,11 @@ "manufacturer": "Raise3D", "category": "Other", "file_formats": "text/x-gcode", - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "raise3D_N2_plus_single_extruder_0" + } }, "overrides": { @@ -49,9 +53,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index 1d01e479b1..62b756b7da 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -8,7 +8,11 @@ "manufacturer": "Raise3D", "category": "Other", "file_formats": "text/x-gcode", - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "raise3D_N2_single_extruder_0" + } }, "overrides": { @@ -49,9 +53,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 6f6de81643..41549fb531 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -6,7 +6,11 @@ "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", "file_formats": "text/x-gcode", "manufacturer": "Renkforce", - "visible": true + "visible": true, + "machine_extruder_trains": + { + "0": "renkforce_rf100_extruder_0" + } }, "overrides": { @@ -76,9 +80,6 @@ "material_bed_temperature": { "enabled": false }, - "material_diameter": { - "value": "1.75" - }, "material_flow": { "value": "110" }, diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index 97b0ebd276..43ffd6924a 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "rigid3d_extruder_0" + } }, "overrides": { @@ -24,7 +28,6 @@ "speed_wall_x": { "default_value": 40 }, "speed_travel": { "default_value": 100 }, "bottom_thickness": { "default_value": 0.75 }, - "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "default_value": 0.25 }, "support_angle": { "default_value": 45 }, "material_bed_temperature": { "default_value": 100 }, diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index 46c22bfa57..bb3414b75d 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "rigid3d_3rdgen_extruder_0" + } }, "overrides": { @@ -23,7 +27,6 @@ "skirt_gap": { "default_value": 5.0 }, "speed_travel": { "default_value": 120 }, "bottom_thickness": { "default_value": 0.75 }, - "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "default_value": 0.25 }, "support_angle": { "default_value": 45 }, "material_bed_temperature": { "default_value": 100 }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index 872cc3e6f4..db48195fe0 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "rigid3d_hobby_extruder_0" + } }, "overrides": { @@ -17,7 +21,6 @@ "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 15 }, "support_pattern": { "default_value": "grid" }, - "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "default_value": 0.25 }, "speed_wall_x": { "default_value": 30 }, "skirt_line_count": { "default_value": 2 }, diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index ed1533e4a6..9f1ac294e5 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -10,7 +10,11 @@ "file_formats": "text/x-gcode", "platform": "rigid3d_mucit_platform.stl", "platform_offset": [ 0, -19, 0], - "preferred_quality_type": "draft" + "preferred_quality_type": "draft", + "machine_extruder_trains": + { + "0": "rigid3d_mucit_extruder_0" + } }, "overrides": { "machine_name": { "default_value": "Rigid3D Mucit" }, @@ -35,9 +39,6 @@ "material_print_temperature": { "value": "205" }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 56fb8284c0..f55f913a56 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "rigid3d_zero_extruder_0" + } }, "overrides": { @@ -30,7 +34,6 @@ "prime_tower_size": { "default_value": 7.745966692414834 }, "skirt_line_count": { "default_value": 2 }, "speed_wall_x": { "default_value": 30 }, - "material_diameter": { "default_value": 1.75 }, "bottom_thickness": { "default_value": 0.75 }, "layer_height_0": { "default_value": 0.25 }, "top_thickness": { "default_value": 0.75 }, diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index 27ceb87c29..7d49ccc72f 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -9,7 +9,11 @@ "has_materials": false, "file_formats": "text/x-gcode", "platform": "rigid3d_zero2_platform.stl", - "platform_offset": [ 5, 0, -35] + "platform_offset": [ 5, 0, -35], + "machine_extruder_trains": + { + "0": "rigid3d_zero2_extruder_0" + } }, "overrides": { "machine_name": { "default_value": "Rigid3D Zero2" }, @@ -43,9 +47,6 @@ "material_bed_temperature": { "default_value": 100 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index bed10025d7..5eb346c7ca 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -7,7 +7,11 @@ "author": "RBC", "manufacturer": "RigidBot", "file_formats": "text/x-gcode", - "platform": "rigidbot_platform.stl" + "platform": "rigidbot_platform.stl", + "machine_extruder_trains": + { + "0": "rigidbot_extruder_0" + } }, "overrides": { @@ -51,9 +55,6 @@ "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index 08cf3b2ab8..5128408b15 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -7,7 +7,11 @@ "author": "RBC", "manufacturer": "RigidBot", "file_formats": "text/x-gcode", - "platform": "rigidbotbig_platform.stl" + "platform": "rigidbotbig_platform.stl", + "machine_extruder_trains": + { + "0": "rigidbot_big_extruder_0" + } }, "overrides": { @@ -54,9 +58,6 @@ "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index b179779c59..8d7698e198 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -7,7 +7,11 @@ "author": "Ultimaker", "manufacturer": "Robo 3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "robo_3d_r1_extruder_0" + } }, "overrides": { @@ -30,7 +34,6 @@ "prime_tower_size": { "default_value": 8.660254037844387 }, "support_enable": { "default_value": true }, "cool_fan_full_at_height": { "default_value": 0.1 }, - "material_diameter": { "default_value": 1.75 }, "bottom_thickness": { "default_value": 1.2 }, "raft_airgap": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.15 }, diff --git a/resources/definitions/seemecnc_artemis.def.json b/resources/definitions/seemecnc_artemis.def.json index 0b31abfa41..731fec5975 100644 --- a/resources/definitions/seemecnc_artemis.def.json +++ b/resources/definitions/seemecnc_artemis.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "artemis_platform.stl", - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "seemecnc_artemis_extruder_0" + } }, "overrides": { @@ -25,7 +29,6 @@ "machine_nozzle_size": { "default_value": 0.5 }, "machine_shape": { "default_value": "elliptic" }, "machine_width": { "default_value": 290 }, - "material_diameter": { "default_value": 1.75 }, "relative_extrusion": { "default_value": false }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "default_value": "off" }, diff --git a/resources/definitions/seemecnc_v32.def.json b/resources/definitions/seemecnc_v32.def.json index 3f46c1540a..6580ee0172 100644 --- a/resources/definitions/seemecnc_v32.def.json +++ b/resources/definitions/seemecnc_v32.def.json @@ -9,7 +9,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "rostock_platform.stl", - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "seemecnc_v32_extruder_0" + } }, "overrides": { @@ -25,7 +29,6 @@ "machine_nozzle_size": { "default_value": 0.5 }, "machine_shape": { "default_value": "elliptic" }, "machine_width": { "default_value": 265 }, - "material_diameter": { "default_value": 1.75 }, "relative_extrusion": { "default_value": false }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "default_value": "off" }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 20bc96358d..9865abedda 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -10,7 +10,11 @@ "platform": "tam_series1.stl", "platform_offset": [-580.0, -6.23, 253.5], "has_materials": false, - "supported_actions":["UpgradeFirmware"] + "supported_actions": ["UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "tam_extruder_0" + } }, "overrides": { "machine_name": { "default_value": "TypeAMachines" }, @@ -43,7 +47,6 @@ "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_expansion_angle": { "default_value": 45 }, diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json index 22f7095e17..dc4feae6f9 100644 --- a/resources/definitions/tevo_blackwidow.def.json +++ b/resources/definitions/tevo_blackwidow.def.json @@ -11,7 +11,11 @@ "has_materials": false, "has_machine_quality": true, "platform": "tevo_blackwidow.stl", - "preferred_quality_type": "normal" + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "tevo_blackwidow_extruder_0" + } }, "overrides": { @@ -43,10 +47,6 @@ { "default_value": 0.4 }, - "material_diameter": - { - "default_value": 1.75 - }, "gantry_height": { "default_value": 0 diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index c3bfb38192..6953dab63a 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -9,7 +9,11 @@ "manufacturer": "Tevo", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "prusai3_platform.stl" + "platform": "prusai3_platform.stl", + "machine_extruder_trains": + { + "0": "tevo_tarantula_extruder_0" + } }, "overrides": @@ -21,7 +25,6 @@ "machine_depth": { "default_value": 200 }, "machine_center_is_zero": { "default_value": false }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_polygon": { "default_value": diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 4febdcd350..768c261785 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -12,7 +12,11 @@ "icon": "icon_uBuild-3D", "platform": "mr_bot_280_platform.stl", "has_materials": true, - "preferred_quality_type": "draft" + "preferred_quality_type": "draft", + "machine_extruder_trains": + { + "0": "ubuild-3d_mr_bot_280_extruder_0" + } }, "overrides": { @@ -22,7 +26,6 @@ "machine_height": { "default_value": 275 }, "machine_depth": { "default_value": 275 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "material_bed_temperature": { "default_value": 70 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height_0": { "default_value": 0.1 }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index a39bebb41c..9de5d9aab9 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -16,7 +16,11 @@ "has_machine_quality": true, "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"], "first_start_actions": ["UM2UpgradeSelection"], - "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"] + "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "ultimaker2_extruder_0" + } }, "overrides": { "machine_name": { "default_value": "Ultimaker 2" }, diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 94667b154d..af169c94fb 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -10,7 +10,11 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2Extendedbackplate.png" + "platform_texture": "Ultimaker2Extendedbackplate.png", + "machine_extruder_trains": + { + "0": "ultimaker2_extended_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json index adde89d858..f3a8bfcf9f 100644 --- a/resources/definitions/ultimaker2_extended_plus.def.json +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -10,7 +10,11 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png", - "supported_actions":["UpgradeFirmware"] + "supported_actions": ["UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "ultimaker2_extended_plus_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index e98381a7d7..c66fb38fc0 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -13,7 +13,11 @@ "platform_texture": "Ultimaker2Gobackplate.png", "platform_offset": [0, 0, 0], "first_start_actions": [], - "supported_actions":["UpgradeFirmware"] + "supported_actions": ["UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "ultimaker2_go_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 935bf5b6c0..bc4d3a6230 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -15,7 +15,11 @@ "has_machine_materials": true, "has_machine_quality": true, "first_start_actions": [], - "supported_actions":["UpgradeFirmware"] + "supported_actions": ["UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "ultimaker2_plus_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index c7c7c291cd..d2418df6b9 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -14,7 +14,11 @@ "has_machine_quality": true, "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"], "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"] + "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "ultimaker_original_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 37d5062fef..71aa53b2bf 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -12,7 +12,11 @@ "platform_texture": "UltimakerPlusbackplate.png", "quality_definition": "ultimaker_original", "first_start_actions": ["UMOCheckup", "BedLevel"], - "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"] + "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"], + "machine_extruder_trains": + { + "0": "ultimaker_original_plus_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/uniqbot_one.def.json b/resources/definitions/uniqbot_one.def.json index ad14728269..b277e78925 100644 --- a/resources/definitions/uniqbot_one.def.json +++ b/resources/definitions/uniqbot_one.def.json @@ -6,7 +6,11 @@ "author": "Unimatech", "manufacturer": "Unimatech", "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2.png" + "icon": "icon_ultimaker2.png", + "machine_extruder_trains": + { + "0": "uniqbot_one_extruder_0" + } }, "overrides": { @@ -29,9 +33,6 @@ "machine_nozzle_size": { "default_value": 0.5 }, - "material_diameter": { - "default_value": 1.75 - }, "gantry_height": { "default_value": 55 }, diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json index 495fd5a5bc..9add22b902 100644 --- a/resources/definitions/vertex_delta_k8800.def.json +++ b/resources/definitions/vertex_delta_k8800.def.json @@ -8,12 +8,13 @@ "visible": true, "author": "Velleman", "has_machine_quality": true, - "has_materials": true + "has_materials": true, + "machine_extruder_trains": + { + "0": "vertex_delta_k8800_extruder_0" + } }, "overrides": { - "material_diameter": { - "default_value": 1.75 - }, "machine_width": { "default_value": 200 }, diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index 92c016aa70..42d94e7723 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -10,7 +10,11 @@ "platform": "Vertex_build_panel.stl", "platform_offset": [0, -3, 0], "supports_usb_connection": true, - "supported_actions": ["MachineSettingsAction"] + "supported_actions": ["MachineSettingsAction"], + "machine_extruder_trains": + { + "0": "vertex_k8400_extruder_0" + } }, "overrides": { "machine_name": { "default_value": "Vertex K8400" }, @@ -41,9 +45,6 @@ "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-60, -18], diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index e4b4f609c1..f5c5668390 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -46,9 +46,6 @@ "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-60, -18], diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index bac8968951..328505e18a 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -7,11 +7,14 @@ "author": "Ultimaker", "manufacturer": "Unknown", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "machine_extruder_trains": + { + "0": "zone3d_printer_extruder_0" + } }, "overrides": { - "material_diameter": { "default_value": 1.75 }, "prime_tower_size": { "default_value": 10.350983390135314 }, "material_print_temperature": { "default_value": 260 }, "layer_height": { "default_value": 0.14 }, diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index bd08ee4a2d..17265bf6f6 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -12,7 +12,11 @@ "quality_definition": "zyyx_agile", "preferred_material": "zyyx_pro_pla", "preferred_quality_type": "normal", - "machine_x3g_variant": "z" + "machine_x3g_variant": "z", + "machine_extruder_trains": + { + "0": "zyyx_agile_extruder_0" + } }, "overrides": { @@ -52,7 +56,6 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "travel_avoid_other_parts": { "default_value": false }, "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 }, - "material_diameter": { "default_value": 1.75 } + "raft_margin": { "default_value": 6 } } } diff --git a/resources/extruders/101Hero_extruder_0.def.json b/resources/extruders/101Hero_extruder_0.def.json new file mode 100644 index 0000000000..82c06e40d6 --- /dev/null +++ b/resources/extruders/101Hero_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "101Hero_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "101Hero", + "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/3dator_extruder_0.def.json b/resources/extruders/3dator_extruder_0.def.json new file mode 100644 index 0000000000..6749eb7bb4 --- /dev/null +++ b/resources/extruders/3dator_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "3dator_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "3dator", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/abax_pri3_extruder_0.def.json b/resources/extruders/abax_pri3_extruder_0.def.json new file mode 100644 index 0000000000..27e86d6042 --- /dev/null +++ b/resources/extruders/abax_pri3_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "abax_pri3_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "abax_pri3", + "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/abax_pri5_extruder_0.def.json b/resources/extruders/abax_pri5_extruder_0.def.json new file mode 100644 index 0000000000..842e76e5f3 --- /dev/null +++ b/resources/extruders/abax_pri5_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "abax_pri5_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "abax_pri5", + "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/abax_titan_extruder_0.def.json b/resources/extruders/abax_titan_extruder_0.def.json new file mode 100644 index 0000000000..79e1974def --- /dev/null +++ b/resources/extruders/abax_titan_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "abax_titan_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "abax_titan", + "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/alya3dp_extruder_0.def.json b/resources/extruders/alya3dp_extruder_0.def.json new file mode 100644 index 0000000000..e34db5dfbf --- /dev/null +++ b/resources/extruders/alya3dp_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "alya3dp_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "alya3dp", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/anycubic_i3_mega_extruder_0.def.json b/resources/extruders/anycubic_i3_mega_extruder_0.def.json new file mode 100644 index 0000000000..6d9c330536 --- /dev/null +++ b/resources/extruders/anycubic_i3_mega_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "anycubic_i3_mega_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "anycubic_i3_mega", + "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/bfb_extruder_0.def.json b/resources/extruders/bfb_extruder_0.def.json new file mode 100644 index 0000000000..88c81ee03e --- /dev/null +++ b/resources/extruders/bfb_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "bfb_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bfb", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.7 } + } +} diff --git a/resources/extruders/bq_hephestos_2_extruder_0.def.json b/resources/extruders/bq_hephestos_2_extruder_0.def.json new file mode 100644 index 0000000000..833907937d --- /dev/null +++ b/resources/extruders/bq_hephestos_2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "bq_hephestos_2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bq_hephestos_2", + "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/bq_hephestos_extruder_0.def.json b/resources/extruders/bq_hephestos_extruder_0.def.json new file mode 100644 index 0000000000..753778f399 --- /dev/null +++ b/resources/extruders/bq_hephestos_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "bq_hephestos_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bq_hephestos", + "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/bq_hephestos_xl_extruder_0.def.json b/resources/extruders/bq_hephestos_xl_extruder_0.def.json new file mode 100644 index 0000000000..91cac04dc9 --- /dev/null +++ b/resources/extruders/bq_hephestos_xl_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "bq_hephestos_xl_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bq_hephestos_xl", + "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/bq_witbox_2_extruder_0.def.json b/resources/extruders/bq_witbox_2_extruder_0.def.json new file mode 100644 index 0000000000..04107f4471 --- /dev/null +++ b/resources/extruders/bq_witbox_2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "bq_witbox_2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bq_witbox_2", + "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/bq_witbox_extruder_0.def.json b/resources/extruders/bq_witbox_extruder_0.def.json new file mode 100644 index 0000000000..d3a5c677af --- /dev/null +++ b/resources/extruders/bq_witbox_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "bq_witbox_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "bq_witbox", + "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/builder_premium_large_front.def.json b/resources/extruders/builder_premium_large_front.def.json index 159682dc1c..059f7ef8a7 100644 --- a/resources/extruders/builder_premium_large_front.def.json +++ b/resources/extruders/builder_premium_large_front.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/builder_premium_large_rear.def.json b/resources/extruders/builder_premium_large_rear.def.json index 5e9cc062ae..769178a8b4 100644 --- a/resources/extruders/builder_premium_large_rear.def.json +++ b/resources/extruders/builder_premium_large_rear.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/builder_premium_medium_front.def.json b/resources/extruders/builder_premium_medium_front.def.json index 9a330b4f4b..bd735fbe25 100644 --- a/resources/extruders/builder_premium_medium_front.def.json +++ b/resources/extruders/builder_premium_medium_front.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/builder_premium_medium_rear.def.json b/resources/extruders/builder_premium_medium_rear.def.json index 49d4734306..59e688ff71 100644 --- a/resources/extruders/builder_premium_medium_rear.def.json +++ b/resources/extruders/builder_premium_medium_rear.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/builder_premium_small_front.def.json b/resources/extruders/builder_premium_small_front.def.json index 2e6293d153..17fb914a42 100644 --- a/resources/extruders/builder_premium_small_front.def.json +++ b/resources/extruders/builder_premium_small_front.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/builder_premium_small_rear.def.json b/resources/extruders/builder_premium_small_rear.def.json index d1606cdd79..70a2dbf1aa 100644 --- a/resources/extruders/builder_premium_small_rear.def.json +++ b/resources/extruders/builder_premium_small_rear.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index 47b5b5abf5..6d2b5f634e 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" }, diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 78bcccd12a..3d49a220c0 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "\n;start T1\n\nM104 T1 S{material_print_temperature_layer_0}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y15 F3000; wipe\nG1 X34 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" }, diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index dbd6643bfe..1f8f8b9ca9 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": -100.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "\n;start T2\n\nM104 T2 S{material_print_temperature_layer_0}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" }, diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index beed117abe..0b1cfe493e 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": -100.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { "default_value": "\n;start T3\n\nM104 T3 S{material_print_temperature_layer_0}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" }, diff --git a/resources/extruders/creality_cr10_extruder_0.def.json b/resources/extruders/creality_cr10_extruder_0.def.json new file mode 100644 index 0000000000..3a259b672b --- /dev/null +++ b/resources/extruders/creality_cr10_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "creality_cr10_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creality_cr10", + "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/creality_cr10s4_extruder_0.def.json b/resources/extruders/creality_cr10s4_extruder_0.def.json new file mode 100644 index 0000000000..9afe1cee35 --- /dev/null +++ b/resources/extruders/creality_cr10s4_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "creality_cr10s4_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creality_cr10s4", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/creality_cr10s5_extruder_0.def.json b/resources/extruders/creality_cr10s5_extruder_0.def.json new file mode 100644 index 0000000000..fed86eb2b5 --- /dev/null +++ b/resources/extruders/creality_cr10s5_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "creality_cr10s5_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creality_cr10s5", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json new file mode 100644 index 0000000000..eb2b8ef1f7 --- /dev/null +++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "dagoma_discoeasy200_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_discoeasy200", + "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/dagoma_neva_extruder_0.def.json b/resources/extruders/dagoma_neva_extruder_0.def.json new file mode 100644 index 0000000000..dcb8311be4 --- /dev/null +++ b/resources/extruders/dagoma_neva_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "dagoma_neva_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_neva", + "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/delta_go_extruder_0.def.json b/resources/extruders/delta_go_extruder_0.def.json new file mode 100644 index 0000000000..2262270dfb --- /dev/null +++ b/resources/extruders/delta_go_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "delta_go_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "delta_go", + "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/deltabot_extruder_0.def.json b/resources/extruders/deltabot_extruder_0.def.json new file mode 100644 index 0000000000..43fce74fa5 --- /dev/null +++ b/resources/extruders/deltabot_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "deltabot_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltabot", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/deltacomb_extruder_0.def.json b/resources/extruders/deltacomb_extruder_0.def.json new file mode 100644 index 0000000000..046becfd82 --- /dev/null +++ b/resources/extruders/deltacomb_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "deltacomb_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb", + "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/easyarts_ares_extruder_0.def.json b/resources/extruders/easyarts_ares_extruder_0.def.json new file mode 100644 index 0000000000..ec7ba81c57 --- /dev/null +++ b/resources/extruders/easyarts_ares_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "easyarts_ares_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "easyarts_ares", + "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/fabtotum_extruder_0.def.json b/resources/extruders/fabtotum_extruder_0.def.json new file mode 100644 index 0000000000..5ed4da6256 --- /dev/null +++ b/resources/extruders/fabtotum_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "fabtotum_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "fabtotum", + "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/felixtec4_dual_extruder_0.def.json b/resources/extruders/felixtec4_dual_extruder_0.def.json index e8af92daef..fee4cbb995 100644 --- a/resources/extruders/felixtec4_dual_extruder_0.def.json +++ b/resources/extruders/felixtec4_dual_extruder_0.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/felixtec4_dual_extruder_1.def.json b/resources/extruders/felixtec4_dual_extruder_1.def.json index 23d2d6648f..2c44b41186 100644 --- a/resources/extruders/felixtec4_dual_extruder_1.def.json +++ b/resources/extruders/felixtec4_dual_extruder_1.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 13 }, "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/folgertech_FT-5_extruder_0.def.json b/resources/extruders/folgertech_FT-5_extruder_0.def.json new file mode 100644 index 0000000000..8ba9d130c6 --- /dev/null +++ b/resources/extruders/folgertech_FT-5_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "folgertech_FT-5_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "folgertech_FT-5", + "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/gmax15plus_dual_extruder_0.def.json b/resources/extruders/gmax15plus_dual_extruder_0.def.json index 0037b75a1c..b490f4a40e 100644 --- a/resources/extruders/gmax15plus_dual_extruder_0.def.json +++ b/resources/extruders/gmax15plus_dual_extruder_0.def.json @@ -16,6 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": 40 }, diff --git a/resources/extruders/gmax15plus_dual_extruder_1.def.json b/resources/extruders/gmax15plus_dual_extruder_1.def.json index 2db9aef3ee..ad3c628d6f 100644 --- a/resources/extruders/gmax15plus_dual_extruder_1.def.json +++ b/resources/extruders/gmax15plus_dual_extruder_1.def.json @@ -16,6 +16,7 @@ "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": 40 }, diff --git a/resources/extruders/gmax15plus_extruder_0.def.json b/resources/extruders/gmax15plus_extruder_0.def.json new file mode 100644 index 0000000000..70389745b3 --- /dev/null +++ b/resources/extruders/gmax15plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "gmax15plus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "gmax15plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/grr_neo_extruder_0.def.json b/resources/extruders/grr_neo_extruder_0.def.json new file mode 100644 index 0000000000..9fe86d9eed --- /dev/null +++ b/resources/extruders/grr_neo_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "grr_neo_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "grr_neo", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/hBp_extruder_left.def.json b/resources/extruders/hBp_extruder_left.def.json index f250ab2d55..7e71ca27a8 100644 --- a/resources/extruders/hBp_extruder_left.def.json +++ b/resources/extruders/hBp_extruder_left.def.json @@ -15,7 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - + "material_diameter": { "default_value": 1.75 }, "extruder_prime_pos_x": { "default_value": 0 }, "extruder_prime_pos_y": { "default_value": 0 }, diff --git a/resources/extruders/hBp_extruder_right.def.json b/resources/extruders/hBp_extruder_right.def.json index aa963cc35b..acd2312268 100644 --- a/resources/extruders/hBp_extruder_right.def.json +++ b/resources/extruders/hBp_extruder_right.def.json @@ -15,7 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - + "material_diameter": { "default_value": 1.75 }, "extruder_prime_pos_x": { "default_value": 185 }, "extruder_prime_pos_y": { "default_value": 0 }, diff --git a/resources/extruders/imade3d_jellybox_extruder_0.def.json b/resources/extruders/imade3d_jellybox_extruder_0.def.json new file mode 100644 index 0000000000..feaa717ee6 --- /dev/null +++ b/resources/extruders/imade3d_jellybox_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "imade3d_jellybox_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "imade3d_jellybox", + "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/innovo_inventor_extruder_0.def.json b/resources/extruders/innovo_inventor_extruder_0.def.json new file mode 100644 index 0000000000..ed599463f2 --- /dev/null +++ b/resources/extruders/innovo_inventor_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "innovo_inventor_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "innovo_inventor", + "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/julia_extruder_0.def.json b/resources/extruders/julia_extruder_0.def.json new file mode 100644 index 0000000000..53a569ccd8 --- /dev/null +++ b/resources/extruders/julia_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "julia_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "julia", + "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/kemiq_q2_beta_extruder_0.def.json b/resources/extruders/kemiq_q2_beta_extruder_0.def.json new file mode 100644 index 0000000000..0c7d1b7b50 --- /dev/null +++ b/resources/extruders/kemiq_q2_beta_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "kemiq_q2_beta_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "kemiq_q2_beta", + "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/kemiq_q2_gama_extruder_0.def.json b/resources/extruders/kemiq_q2_gama_extruder_0.def.json new file mode 100644 index 0000000000..bb165ca35e --- /dev/null +++ b/resources/extruders/kemiq_q2_gama_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "kemiq_q2_gama_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "kemiq_q2_gama", + "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/kossel_mini_extruder_0.def.json b/resources/extruders/kossel_mini_extruder_0.def.json new file mode 100644 index 0000000000..f57154e1a3 --- /dev/null +++ b/resources/extruders/kossel_mini_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "kossel_mini_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "kossel_mini", + "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/kossel_pro_extruder_0.def.json b/resources/extruders/kossel_pro_extruder_0.def.json new file mode 100644 index 0000000000..921e1d8bb4 --- /dev/null +++ b/resources/extruders/kossel_pro_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "kossel_pro_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "kossel_pro", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/kupido_extruder_0.def.json b/resources/extruders/kupido_extruder_0.def.json new file mode 100644 index 0000000000..d93395e667 --- /dev/null +++ b/resources/extruders/kupido_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "kupido_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "kupido", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/makeR_pegasus_extruder_0.def.json b/resources/extruders/makeR_pegasus_extruder_0.def.json new file mode 100644 index 0000000000..8d2a98340a --- /dev/null +++ b/resources/extruders/makeR_pegasus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "makeR_pegasus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "makeR_pegasus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json b/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json new file mode 100644 index 0000000000..a80d4079cb --- /dev/null +++ b/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "makeR_prusa_tairona_i3_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "makeR_prusa_tairona_i3", + "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/makeit_dual_1st.def.json b/resources/extruders/makeit_dual_1st.def.json index ebfa475eac..2882054cca 100644 --- a/resources/extruders/makeit_dual_1st.def.json +++ b/resources/extruders/makeit_dual_1st.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/makeit_dual_2nd.def.json b/resources/extruders/makeit_dual_2nd.def.json index 99744e8b5a..24e9be3a4a 100644 --- a/resources/extruders/makeit_dual_2nd.def.json +++ b/resources/extruders/makeit_dual_2nd.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/makeit_l_dual_1st.def.json b/resources/extruders/makeit_l_dual_1st.def.json index cdab6441eb..bf3f99bfa7 100644 --- a/resources/extruders/makeit_l_dual_1st.def.json +++ b/resources/extruders/makeit_l_dual_1st.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/makeit_l_dual_2nd.def.json b/resources/extruders/makeit_l_dual_2nd.def.json index 3db9c0696c..3964ef6779 100644 --- a/resources/extruders/makeit_l_dual_2nd.def.json +++ b/resources/extruders/makeit_l_dual_2nd.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json new file mode 100644 index 0000000000..5c60e536b7 --- /dev/null +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "maker_starter_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "maker_starter", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/makerbotreplicator_extruder_0.def.json b/resources/extruders/makerbotreplicator_extruder_0.def.json new file mode 100644 index 0000000000..36a975ace1 --- /dev/null +++ b/resources/extruders/makerbotreplicator_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "makerbotreplicator_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "makerbotreplicator", + "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/malyan_m180_extruder_0.def.json b/resources/extruders/malyan_m180_extruder_0.def.json new file mode 100644 index 0000000000..bdf5350b26 --- /dev/null +++ b/resources/extruders/malyan_m180_extruder_0.def.json @@ -0,0 +1,18 @@ +{ + "id": "malyan_m180_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "malyan_m180", + "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/malyan_m200_extruder_0.def.json b/resources/extruders/malyan_m200_extruder_0.def.json new file mode 100644 index 0000000000..4a135aa72d --- /dev/null +++ b/resources/extruders/malyan_m200_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "malyan_m200_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "malyan_m200", + "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/mankati_fullscale_xt_plus_extruder_0.def.json b/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json new file mode 100644 index 0000000000..032a577022 --- /dev/null +++ b/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "mankati_fullscale_xt_plus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mankati_fullscale_xt_plus", + "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/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json new file mode 100644 index 0000000000..3ee2fd2b10 --- /dev/null +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "mendel90_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mendel90", + "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/monoprice_select_mini_v1_extruder_0.def.json b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json new file mode 100644 index 0000000000..eef47c9b6f --- /dev/null +++ b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "monoprice_select_mini_v1_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "monoprice_select_mini_v1", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json new file mode 100644 index 0000000000..e0899304dd --- /dev/null +++ b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "monoprice_select_mini_v2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "monoprice_select_mini_v2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ord_extruder_0.def.json b/resources/extruders/ord_extruder_0.def.json index c3f8d75cc0..f98666716d 100644 --- a/resources/extruders/ord_extruder_0.def.json +++ b/resources/extruders/ord_extruder_0.def.json @@ -14,6 +14,7 @@ "maximum_value": "4" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/ord_extruder_1.def.json b/resources/extruders/ord_extruder_1.def.json index 9b7990605d..9ea08cf626 100644 --- a/resources/extruders/ord_extruder_1.def.json +++ b/resources/extruders/ord_extruder_1.def.json @@ -14,6 +14,7 @@ "maximum_value": "4" }, "machine_nozzle_offset_x": { "default_value": 62.95 }, - "machine_nozzle_offset_y": { "default_value": 2.05 } + "machine_nozzle_offset_y": { "default_value": 2.05 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/ord_extruder_2.def.json b/resources/extruders/ord_extruder_2.def.json index 4e8a9f6c15..1b521c7507 100644 --- a/resources/extruders/ord_extruder_2.def.json +++ b/resources/extruders/ord_extruder_2.def.json @@ -14,6 +14,7 @@ "maximum_value": "4" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 27.7 } + "machine_nozzle_offset_y": { "default_value": 27.7 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/ord_extruder_3.def.json b/resources/extruders/ord_extruder_3.def.json index e8da77a6ec..bd4d0e2a61 100644 --- a/resources/extruders/ord_extruder_3.def.json +++ b/resources/extruders/ord_extruder_3.def.json @@ -14,6 +14,7 @@ "maximum_value": "4" }, "machine_nozzle_offset_x": { "default_value": 63.18 }, - "machine_nozzle_offset_y": { "default_value": 28.65 } + "machine_nozzle_offset_y": { "default_value": 28.65 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/ord_extruder_4.def.json b/resources/extruders/ord_extruder_4.def.json index aa6c8052bf..00635e9059 100644 --- a/resources/extruders/ord_extruder_4.def.json +++ b/resources/extruders/ord_extruder_4.def.json @@ -14,6 +14,7 @@ "maximum_value": "4" }, "machine_nozzle_offset_x": { "default_value": 31.6 }, - "machine_nozzle_offset_y": { "default_value": 28.2 } + "machine_nozzle_offset_y": { "default_value": 28.2 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/peopoly_moai_extruder_0.def.json b/resources/extruders/peopoly_moai_extruder_0.def.json new file mode 100644 index 0000000000..7940002926 --- /dev/null +++ b/resources/extruders/peopoly_moai_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "peopoly_moai_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "peopoly_moai", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.067 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/printrbot_play_extruder_0.def.json b/resources/extruders/printrbot_play_extruder_0.def.json new file mode 100644 index 0000000000..ef1284758b --- /dev/null +++ b/resources/extruders/printrbot_play_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "printrbot_play_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "printrbot_play", + "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/printrbot_play_heated_extruder_0.def.json b/resources/extruders/printrbot_play_heated_extruder_0.def.json new file mode 100644 index 0000000000..ba8bc5c34c --- /dev/null +++ b/resources/extruders/printrbot_play_heated_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "printrbot_play_heated_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "printrbot_play_heated", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/printrbot_simple_extended_extruder_0.def.json b/resources/extruders/printrbot_simple_extended_extruder_0.def.json new file mode 100644 index 0000000000..71c8863552 --- /dev/null +++ b/resources/extruders/printrbot_simple_extended_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "printrbot_simple_extended_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "printrbot_simple_extended", + "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/printrbot_simple_extruder_0.def.json b/resources/extruders/printrbot_simple_extruder_0.def.json new file mode 100644 index 0000000000..e97977e07e --- /dev/null +++ b/resources/extruders/printrbot_simple_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "printrbot_simple_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "printrbot_simple", + "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/printrbot_simple_makers_kit_extruder_0.def.json b/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json new file mode 100644 index 0000000000..f002bb9cf5 --- /dev/null +++ b/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "printrbot_simple_makers_kit_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "printrbot_simple_makers_kit", + "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/prusa_i3_extruder_0.def.json b/resources/extruders/prusa_i3_extruder_0.def.json new file mode 100644 index 0000000000..11c52e062b --- /dev/null +++ b/resources/extruders/prusa_i3_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "prusa_i3_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "prusa_i3", + "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/prusa_i3_mk2_extruder_0.def.json b/resources/extruders/prusa_i3_mk2_extruder_0.def.json new file mode 100644 index 0000000000..a56aae4300 --- /dev/null +++ b/resources/extruders/prusa_i3_mk2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "prusa_i3_mk2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "prusa_i3_mk2", + "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/prusa_i3_xl_extruder_0.def.json b/resources/extruders/prusa_i3_xl_extruder_0.def.json new file mode 100644 index 0000000000..5dc2ab3bc0 --- /dev/null +++ b/resources/extruders/prusa_i3_xl_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "prusa_i3_xl_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "prusa_i3_xl", + "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/punchtec_connect_xl_extruder_0.def.json b/resources/extruders/punchtec_connect_xl_extruder_0.def.json index b618999fc2..68c3d8c906 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_0.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_0.def.json @@ -14,6 +14,7 @@ "maximum_value": "1" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/punchtec_connect_xl_extruder_1.def.json b/resources/extruders/punchtec_connect_xl_extruder_1.def.json index 1173bb5584..a2e4b31714 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_1.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_1.def.json @@ -14,6 +14,7 @@ "maximum_value": "1" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/raise3D_N2_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_dual_extruder_0.def.json index 330d016c55..b97ee19d24 100644 --- a/resources/extruders/raise3D_N2_dual_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_dual_extruder_0.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/raise3D_N2_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_dual_extruder_1.def.json index f79033e496..28c030b28e 100644 --- a/resources/extruders/raise3D_N2_dual_extruder_1.def.json +++ b/resources/extruders/raise3D_N2_dual_extruder_1.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 24.8 }, "machine_nozzle_offset_y": { "default_value": 0.6 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json index f105dcbaf9..3905e074ae 100644 --- a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json index b0fa1b51d0..65c9fb7274 100644 --- a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json +++ b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 24.8 }, "machine_nozzle_offset_y": { "default_value": 0.6 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json new file mode 100644 index 0000000000..bb6e631864 --- /dev/null +++ b/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "raise3D_N2_plus_single_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "raise3D_N2_plus_single", + "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/raise3D_N2_single_extruder_0.def.json b/resources/extruders/raise3D_N2_single_extruder_0.def.json new file mode 100644 index 0000000000..08fedff99c --- /dev/null +++ b/resources/extruders/raise3D_N2_single_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "raise3D_N2_single_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "raise3D_N2_single", + "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/renkforce_rf100_extruder_0.def.json b/resources/extruders/renkforce_rf100_extruder_0.def.json new file mode 100644 index 0000000000..6a7f883309 --- /dev/null +++ b/resources/extruders/renkforce_rf100_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "renkforce_rf100_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "renkforce_rf100", + "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/rigid3d_3rdgen_extruder_0.def.json b/resources/extruders/rigid3d_3rdgen_extruder_0.def.json new file mode 100644 index 0000000000..e309086a72 --- /dev/null +++ b/resources/extruders/rigid3d_3rdgen_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigid3d_3rdgen_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigid3d_3rdgen", + "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/rigid3d_extruder_0.def.json b/resources/extruders/rigid3d_extruder_0.def.json new file mode 100644 index 0000000000..e34987cd6e --- /dev/null +++ b/resources/extruders/rigid3d_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigid3d_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigid3d", + "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/rigid3d_hobby_extruder_0.def.json b/resources/extruders/rigid3d_hobby_extruder_0.def.json new file mode 100644 index 0000000000..681aeecb43 --- /dev/null +++ b/resources/extruders/rigid3d_hobby_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigid3d_hobby_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigid3d_hobby", + "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/rigid3d_mucit_extruder_0.def.json b/resources/extruders/rigid3d_mucit_extruder_0.def.json new file mode 100644 index 0000000000..af3f54e150 --- /dev/null +++ b/resources/extruders/rigid3d_mucit_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigid3d_mucit_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigid3d_mucit", + "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/rigid3d_zero2_extruder_0.def.json b/resources/extruders/rigid3d_zero2_extruder_0.def.json new file mode 100644 index 0000000000..30d1dbb3c4 --- /dev/null +++ b/resources/extruders/rigid3d_zero2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigid3d_zero2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigid3d_zero2", + "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/rigid3d_zero_extruder_0.def.json b/resources/extruders/rigid3d_zero_extruder_0.def.json new file mode 100644 index 0000000000..6c5ae10ddb --- /dev/null +++ b/resources/extruders/rigid3d_zero_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigid3d_zero_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigid3d_zero", + "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/rigidbot_big_extruder_0.def.json b/resources/extruders/rigidbot_big_extruder_0.def.json new file mode 100644 index 0000000000..2b07adaaaa --- /dev/null +++ b/resources/extruders/rigidbot_big_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigidbot_big_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigidbot_big", + "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/rigidbot_extruder_0.def.json b/resources/extruders/rigidbot_extruder_0.def.json new file mode 100644 index 0000000000..32ce3fc1c3 --- /dev/null +++ b/resources/extruders/rigidbot_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "rigidbot_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "rigidbot", + "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/robo_3d_r1_extruder_0.def.json b/resources/extruders/robo_3d_r1_extruder_0.def.json new file mode 100644 index 0000000000..0872e91a11 --- /dev/null +++ b/resources/extruders/robo_3d_r1_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "robo_3d_r1_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "robo_3d_r1", + "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/seemecnc_artemis_extruder_0.def.json b/resources/extruders/seemecnc_artemis_extruder_0.def.json new file mode 100644 index 0000000000..a709a80cbf --- /dev/null +++ b/resources/extruders/seemecnc_artemis_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "seemecnc_artemis_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "seemecnc_artemis", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/seemecnc_v32_extruder_0.def.json b/resources/extruders/seemecnc_v32_extruder_0.def.json new file mode 100644 index 0000000000..5bd489e537 --- /dev/null +++ b/resources/extruders/seemecnc_v32_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "seemecnc_v32_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "seemecnc_v32", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json new file mode 100644 index 0000000000..fc53efad3f --- /dev/null +++ b/resources/extruders/tam_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "tam_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "tam", + "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/tevo_blackwidow_extruder_0.def.json b/resources/extruders/tevo_blackwidow_extruder_0.def.json new file mode 100644 index 0000000000..125cf19c98 --- /dev/null +++ b/resources/extruders/tevo_blackwidow_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "tevo_blackwidow_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "tevo_blackwidow", + "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/tevo_tarantula_extruder_0.def.json b/resources/extruders/tevo_tarantula_extruder_0.def.json new file mode 100644 index 0000000000..bc43986814 --- /dev/null +++ b/resources/extruders/tevo_tarantula_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "tevo_tarantula_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "tevo_tarantula", + "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/ubuild-3d_mr_bot_280_extruder_0.def.json b/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json new file mode 100644 index 0000000000..b04ca0dcbf --- /dev/null +++ b/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ubuild-3d_mr_bot_280_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ubuild-3d_mr_bot_280", + "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/ultimaker2_extended_extruder_0.def.json b/resources/extruders/ultimaker2_extended_extruder_0.def.json new file mode 100644 index 0000000000..6387ec72ed --- /dev/null +++ b/resources/extruders/ultimaker2_extended_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker2_extended_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker2_extended", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json b/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json new file mode 100644 index 0000000000..39fc665ff2 --- /dev/null +++ b/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker2_extended_plus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker2_extended_plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json new file mode 100644 index 0000000000..2daf57c73f --- /dev/null +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker2_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ultimaker2_go_extruder_0.def.json b/resources/extruders/ultimaker2_go_extruder_0.def.json new file mode 100644 index 0000000000..4c258e237e --- /dev/null +++ b/resources/extruders/ultimaker2_go_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker2_go_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker2_go", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json new file mode 100644 index 0000000000..13ab0c59ea --- /dev/null +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker2_plus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker2_plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ultimaker_original_extruder_0.def.json b/resources/extruders/ultimaker_original_extruder_0.def.json new file mode 100644 index 0000000000..4aab693212 --- /dev/null +++ b/resources/extruders/ultimaker_original_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker_original_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_original", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/ultimaker_original_plus_extruder_0.def.json b/resources/extruders/ultimaker_original_plus_extruder_0.def.json new file mode 100644 index 0000000000..91d0751861 --- /dev/null +++ b/resources/extruders/ultimaker_original_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "ultimaker_original_plus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_original_plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 2.85 } + } +} diff --git a/resources/extruders/uniqbot_one_extruder_0.def.json b/resources/extruders/uniqbot_one_extruder_0.def.json new file mode 100644 index 0000000000..65436ee789 --- /dev/null +++ b/resources/extruders/uniqbot_one_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "uniqbot_one_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "uniqbot_one", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/vertex_delta_k8800_extruder_0.def.json b/resources/extruders/vertex_delta_k8800_extruder_0.def.json new file mode 100644 index 0000000000..5e09046faf --- /dev/null +++ b/resources/extruders/vertex_delta_k8800_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "vertex_delta_k8800_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "vertex_delta_k8800", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/vertex_k8400_dual_1st.def.json b/resources/extruders/vertex_k8400_dual_1st.def.json index 74a9c557a5..2694323f7d 100644 --- a/resources/extruders/vertex_k8400_dual_1st.def.json +++ b/resources/extruders/vertex_k8400_dual_1st.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 23.7 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/vertex_k8400_dual_2nd.def.json b/resources/extruders/vertex_k8400_dual_2nd.def.json index ffa4b77a1e..044f7000af 100644 --- a/resources/extruders/vertex_k8400_dual_2nd.def.json +++ b/resources/extruders/vertex_k8400_dual_2nd.def.json @@ -15,6 +15,7 @@ }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, diff --git a/resources/extruders/vertex_k8400_extruder_0.def.json b/resources/extruders/vertex_k8400_extruder_0.def.json new file mode 100644 index 0000000000..c03453b519 --- /dev/null +++ b/resources/extruders/vertex_k8400_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "vertex_k8400_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "vertex_k8400", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/zone3d_printer_extruder_0.def.json b/resources/extruders/zone3d_printer_extruder_0.def.json new file mode 100644 index 0000000000..ca024dd5c4 --- /dev/null +++ b/resources/extruders/zone3d_printer_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "zone3d_printer_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "zone3d_printer", + "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/zyyx_agile_extruder_0.def.json b/resources/extruders/zyyx_agile_extruder_0.def.json new file mode 100644 index 0000000000..edda9b3097 --- /dev/null +++ b/resources/extruders/zyyx_agile_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "zyyx_agile_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "zyyx_agile", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +}