3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Nino van Hooff 2019-10-21 13:37:37 +02:00
commit 2058cf8601
92 changed files with 231 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cura/Machines/Models/BaseMaterialsModel.py
View file

@ -1,9 +1,9 @@
# Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Optional, Dict, Set
from typing import Dict, Set
from PyQt5.QtCore import Qt, pyqtSignal, pyqtProperty
from PyQt5.QtCore import Qt, QTimer, pyqtSignal, pyqtProperty
from UM.Qt.ListModel import ListModel
@ -38,14 +38,25 @@ class BaseMaterialsModel(ListModel):
self._extruder_stack = None
self._enabled = True
# CURA-6904
# Updating the material model requires information from material nodes and containers. We use a timer here to
# make sure that an update function call will not be directly invoked by an event. Because the triggered event
# can be caused in the middle of a XMLMaterial loading, and the material container we try to find may not be
# in the system yet. This will cause an infinite recursion of (1) trying to load a material, (2) trying to
# update the material model, (3) cannot find the material container, load it, (4) repeat #1.
self._update_timer = QTimer()
self._update_timer.setInterval(100)
self._update_timer.setSingleShot(True)
self._update_timer.timeout.connect(self._update)
# Update the stack and the model data when the machine changes
self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack)
self._updateExtruderStack()
# Update this model when switching machines, when adding materials or changing their metadata.
self._machine_manager.activeStackChanged.connect(self._update)
self._machine_manager.activeStackChanged.connect(self._onChanged)
ContainerTree.getInstance().materialsChanged.connect(self._materialsListChanged)
self._application.getMaterialManagementModel().favoritesChanged.connect(self._update)
self._application.getMaterialManagementModel().favoritesChanged.connect(self._onChanged)
self.addRoleName(Qt.UserRole + 1, "root_material_id")
self.addRoleName(Qt.UserRole + 2, "id")
@ -64,14 +75,17 @@ class BaseMaterialsModel(ListModel):
self.addRoleName(Qt.UserRole + 15, "container_node")
self.addRoleName(Qt.UserRole + 16, "is_favorite")
def _onChanged(self) -> None:
self._update_timer.start()
def _updateExtruderStack(self):
global_stack = self._machine_manager.activeMachine
if global_stack is None:
return
if self._extruder_stack is not None:
self._extruder_stack.pyqtContainersChanged.disconnect(self._update)
self._extruder_stack.approximateMaterialDiameterChanged.disconnect(self._update)
self._extruder_stack.pyqtContainersChanged.disconnect(self._onChanged)
self._extruder_stack.approximateMaterialDiameterChanged.disconnect(self._onChanged)
try:
self._extruder_stack = global_stack.extruderList[self._extruder_position]
@ -79,10 +93,10 @@ class BaseMaterialsModel(ListModel):
self._extruder_stack = None
if self._extruder_stack is not None:
self._extruder_stack.pyqtContainersChanged.connect(self._update)
self._extruder_stack.approximateMaterialDiameterChanged.connect(self._update)
self._extruder_stack.pyqtContainersChanged.connect(self._onChanged)
self._extruder_stack.approximateMaterialDiameterChanged.connect(self._onChanged)
# Force update the model when the extruder stack changes
self._update()
self._onChanged()
def setExtruderPosition(self, position: int):
if self._extruder_stack is None or self._extruder_position != position:
@ -99,7 +113,7 @@ class BaseMaterialsModel(ListModel):
self._enabled = enabled
if self._enabled:
# ensure the data is there again.
self._update()
self._onChanged()
self.enabledChanged.emit()
@pyqtProperty(bool, fset = setEnabled, notify = enabledChanged)
@ -119,12 +133,12 @@ class BaseMaterialsModel(ListModel):
return
if material.variant.machine.container_id != global_stack.definition.getId():
return
self._update()
self._onChanged()
## Triggered when the list of favorite materials is changed.
def _favoritesChanged(self, material_base_file: str) -> None:
if material_base_file in self._available_materials:
self._update()
self._onChanged()
## This is an abstract method that needs to be implemented by the specific
# models themselves.

4
cura/Machines/Models/FavoriteMaterialsModel.py
View file

@ -9,14 +9,14 @@ class FavoriteMaterialsModel(BaseMaterialsModel):
def __init__(self, parent = None):
super().__init__(parent)
cura.CuraApplication.CuraApplication.getInstance().getPreferences().preferenceChanged.connect(self._onFavoritesChanged)
self._update()
self._onChanged()
## Triggered when any preference changes, but only handles it when the list
# of favourites is changed.
def _onFavoritesChanged(self, preference_key: str) -> None:
if preference_key != "cura/favorite_materials":
return
self._update()
self._onChanged()
def _update(self):
if not self._canUpdate():

2
cura/Machines/Models/GenericMaterialsModel.py
View file

@ -7,7 +7,7 @@ class GenericMaterialsModel(BaseMaterialsModel):
def __init__(self, parent = None):
super().__init__(parent)
self._update()
self._onChanged()
def _update(self):
if not self._canUpdate():

39
cura/Machines/Models/IntentCategoryModel.py
View file

@ -3,7 +3,7 @@
from PyQt5.QtCore import Qt
import collections
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Optional, Dict
from cura.Machines.Models.IntentModel import IntentModel
from cura.Settings.IntentManager import IntentManager
@ -25,16 +25,26 @@ class IntentCategoryModel(ListModel):
IntentCategoryRole = Qt.UserRole + 2
WeightRole = Qt.UserRole + 3
QualitiesRole = Qt.UserRole + 4
#Translations to user-visible string. Ordered by weight.
#TODO: Create a solution for this name and weight to be used dynamically.
name_translation = collections.OrderedDict() #type: "collections.OrderedDict[str,str]"
name_translation["default"] = catalog.i18nc("@label", "Default")
name_translation["engineering"] = catalog.i18nc("@label", "Engineering")
name_translation["smooth"] = catalog.i18nc("@label", "Smooth")
DescriptionRole = Qt.UserRole + 5
modelUpdated = pyqtSignal()
# Translations to user-visible string. Ordered by weight.
# TODO: Create a solution for this name and weight to be used dynamically.
_translations = collections.OrderedDict() # type: "collections.OrderedDict[str,Dict[str,Optional[str]]]"
_translations["default"] = {
"name": catalog.i18nc("@label", "Default")
}
_translations["engineering"] = {
"name": catalog.i18nc("@label", "Engineering"),
"description": catalog.i18nc("@text", "Suitable for engineering work")
}
_translations["smooth"] = {
"name": catalog.i18nc("@label", "Smooth"),
"description": catalog.i18nc("@text", "Optimized for a smooth surfaces")
}
## Creates a new model for a certain intent category.
# \param The category to list the intent profiles for.
def __init__(self, intent_category: str) -> None:
@ -45,6 +55,7 @@ class IntentCategoryModel(ListModel):
self.addRoleName(self.IntentCategoryRole, "intent_category")
self.addRoleName(self.WeightRole, "weight")
self.addRoleName(self.QualitiesRole, "qualities")
self.addRoleName(self.DescriptionRole, "description")
application = cura.CuraApplication.CuraApplication.getInstance()
@ -75,10 +86,18 @@ class IntentCategoryModel(ListModel):
qualities = IntentModel()
qualities.setIntentCategory(category)
result.append({
"name": self.name_translation.get(category, catalog.i18nc("@label", "Unknown")),
"name": IntentCategoryModel.translation(category, "name", catalog.i18nc("@label", "Unknown")),
"description": IntentCategoryModel.translation(category, "description", None),
"intent_category": category,
"weight": list(self.name_translation.keys()).index(category),
"weight": list(self._translations.keys()).index(category),
"qualities": qualities
})
result.sort(key = lambda k: k["weight"])
self.setItems(result)
## Get a display value for a category. See IntenCategoryModel._translations
## for categories and keys
@staticmethod
def translation(category: str, key: str, default: Optional[str] = None):
display_strings = IntentCategoryModel._translations.get(category, {})
return display_strings.get(key, default)

4
cura/Machines/Models/QualityManagementModel.py
View file

@ -345,11 +345,13 @@ class QualityManagementModel(ListModel):
# Create quality_changes group items
quality_changes_item_list = []
for quality_changes_group in quality_changes_group_list:
# CURA-6913 Note that custom qualities can be based on "not supported", so the quality group can be None.
quality_group = quality_group_dict.get(quality_changes_group.quality_type)
quality_type = quality_changes_group.quality_type
item = {"name": quality_changes_group.name,
"is_read_only": False,
"quality_group": quality_group,
"quality_type": quality_group.quality_type,
"quality_type": quality_type,
"quality_changes_group": quality_changes_group,
"intent_category": quality_changes_group.intent_category,
"section_name": catalog.i18nc("@label", "Custom profiles"),

5
cura/Settings/MachineManager.py
View file

@ -1586,8 +1586,9 @@ class MachineManager(QObject):
intent_category = self.activeIntentCategory
if intent_category != "default":
intent_display_name = IntentCategoryModel.name_translation.get(intent_category,
catalog.i18nc("@label", "Unknown"))
intent_display_name = IntentCategoryModel.translation(intent_category,
"name",
catalog.i18nc("@label", "Unknown"))
display_name = "{intent_name} - {the_rest}".format(intent_name = intent_display_name,
the_rest = display_name)

3
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -107,7 +107,8 @@ class StartSliceJob(Job):
return False
# if there are no per-object settings we don't need to check the other settings here
if stack.getTop() is None or not stack.getTop().getAllKeys():
stack_top = stack.getTop()
if stack_top is None or not stack_top.getAllKeys():
return False
for key in stack.getAllKeys():

10
plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py
View file

@ -36,9 +36,15 @@ class ZeroConfClient:
def start(self) -> None:
self._service_changed_request_queue = Queue()
self._service_changed_request_event = Event()
self._service_changed_request_thread = Thread(target=self._handleOnServiceChangedRequests, daemon=True)
try:
self._zero_conf = Zeroconf()
# CURA-6855 catch WinErrors
except OSError:
Logger.logException("e", "Failed to create zeroconf instance.")
return
self._service_changed_request_thread = Thread(target = self._handleOnServiceChangedRequests, daemon = True)
self._service_changed_request_thread.start()
self._zero_conf = Zeroconf()
self._zero_conf_browser = ServiceBrowser(self._zero_conf, self.ZERO_CONF_NAME, [self._queueService])
# Cleanup ZeroConf resources.

1
resources/definitions/101Hero.def.json
View file

@ -34,7 +34,6 @@
},
"speed_print": { "default_value": 14 },
"speed_travel": { "value": "speed_print" },
"speed_infill": { "default_value": 14 },
"speed_wall": { "value": "speed_print * 0.7" },
"speed_topbottom": { "value": "speed_print * 0.7" },
"speed_layer_0": { "value": "speed_print * 0.7" },

7
resources/definitions/3dator.def.json
View file

@ -17,15 +17,10 @@
"overrides": {
"machine_name": { "default_value": "3Dator" },
"speed_travel": { "default_value": 120 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"infill_sparse_density": { "default_value": 20 },
"speed_wall_x": { "default_value": 45 },
"speed_wall_0": { "default_value": 40 },
"speed_topbottom": { "default_value": 35 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 50 },
"speed_infill": { "default_value": 60 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_height": { "default_value": 260 },
@ -33,8 +28,6 @@
"machine_depth": { "default_value": 170 },
"machine_width": { "default_value": 180 },
"retraction_speed": {"default_value":100},
"cool_fan_speed_min": {"default_value": 20},
"cool_fan_speed_max": {"default_value": 70},
"adhesion_type": { "default_value": "none" },
"machine_head_with_fans_polygon": {
"default_value": [

12
resources/definitions/Mark2_for_Ultimaker2.def.json
View file

@ -79,9 +79,6 @@
"line_width": {
"value": "round(machine_nozzle_size * 0.875, 2)"
},
"speed_layer_0": {
"default_value": 20
},
"speed_support": {
"value": "speed_wall_0"
},
@ -107,22 +104,18 @@
"default_value": 25
},
"switch_extruder_retraction_amount": {
"default_value": 0,
"value": "retraction_amount",
"enabled": false
},
"switch_extruder_retraction_speeds": {
"default_value": 25,
"value": "retraction_speed",
"enabled": false
},
"switch_extruder_retraction_speed": {
"default_value": 25,
"value": "retraction_retract_speed",
"enabled": false
},
"switch_extruder_prime_speed": {
"default_value": 25,
"value": "retraction_prime_speed",
"enabled": false
},
@ -142,11 +135,9 @@
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode" : {
"default_value": "",
"value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\""
},
"machine_end_gcode" : {
"default_value": "",
"value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\""
},
"machine_extruder_count": {
@ -158,12 +149,10 @@
},
"acceleration_print":
{
"default_value": 2000,
"value": "2000"
},
"acceleration_travel":
{
"default_value": 3000,
"value": "acceleration_print if magic_spiralize else 3000"
},
"acceleration_layer_0": { "value": "acceleration_topbottom" },
@ -183,7 +172,6 @@
},
"jerk_travel":
{
"default_value": 20,
"value": "jerk_print if magic_spiralize else 20"
},
"jerk_layer_0": { "value": "jerk_topbottom" },

24
resources/definitions/abax_pri3.def.json
View file

@ -49,33 +49,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"material_print_temperature": {
"default_value": 200
},
"material_bed_temperature": {
"default_value": 0
},
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 70
},
"speed_wall": {
"default_value": 25
},
"speed_topbottom": {
"default_value": 15
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 30
},
"support_enable": {
"default_value": true
}

24
resources/definitions/abax_pri5.def.json
View file

@ -49,33 +49,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"material_print_temperature": {
"default_value": 200
},
"material_bed_temperature": {
"default_value": 0
},
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 70
},
"speed_wall": {
"default_value": 25
},
"speed_topbottom": {
"default_value": 15
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 30
},
"support_enable": {
"default_value": true
}

24
resources/definitions/abax_titan.def.json
View file

@ -49,33 +49,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"material_print_temperature": {
"default_value": 200
},
"material_bed_temperature": {
"default_value": 0
},
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 70
},
"speed_wall": {
"default_value": 25
},
"speed_topbottom": {
"default_value": 15
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 30
},
"support_enable": {
"default_value": true
}

21
resources/definitions/alfawise_u20.def.json
View file

@ -47,12 +47,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 210
},
"material_bed_temperature": {
"default_value": 50
},
"layer_height_0": {
"default_value": 0.2
},
@ -62,21 +56,6 @@
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 20
},
"support_enable": {
"default_value": true
},

7
resources/definitions/alfawise_u30.def.json
View file

@ -22,16 +22,9 @@
"default_value": "; -- END GCODE --\nM104 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-5 X-20 Y-20 F80 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM107 ;turn the fan off; -- end of END GCODE --"
},
"material_diameter": { "default_value": 1.75 },
"material_print_temperature": { "default_value": 210 },
"material_bed_temperature": { "default_value": 50 },
"layer_height_0": { "default_value": 0.2 },
"wall_thickness": { "default_value": 1.2 },
"speed_print": { "default_value": 40 },
"speed_infill": { "default_value": 50 },
"speed_wall": { "default_value": 35 },
"speed_topbottom": { "default_value": 35 },
"speed_travel": { "default_value": 120 },
"speed_layer_0": { "default_value": 20 },
"support_enable": { "default_value": true },
"retraction_enable": { "default_value": true },
"retraction_amount": { "default_value": 5 },

9
resources/definitions/bfb.def.json
View file

@ -15,26 +15,19 @@
},
"overrides": {
"speed_topbottom": { "default_value": 40 },
"speed_print": { "default_value": 40 },
"machine_extruder_count": { "default_value": 1 },
"prime_tower_size": { "default_value": 7.745966692414834 },
"machine_name": { "default_value": "BFB_Test" },
"machine_heated_bed": { "default_value": false },
"speed_layer_0": { "default_value": 25 },
"machine_width": { "default_value": 275 },
"machine_gcode_flavor": { "default_value": "BFB" },
"machine_depth": { "default_value": 265 },
"speed_infill": { "default_value": 30 },
"machine_center_is_zero": { "default_value": true },
"machine_height": { "default_value": 240 },
"layer_height": { "default_value": 0.25 },
"material_print_temperature": { "default_value": 200 },
"retraction_amount": { "default_value": 0.05 },
"speed_wall_0": { "default_value": 25 },
"speed_travel": { "default_value": 50 },
"infill_sparse_density": { "default_value": 10 },
"layer_height_0": { "default_value": 0.5 },
"speed_wall_x": { "default_value": 20 }
"layer_height_0": { "default_value": 0.5 }
}
}

24
resources/definitions/bq_hephestos.def.json
View file

@ -54,33 +54,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"material_print_temperature": {
"default_value": 220
},
"material_bed_temperature": {
"default_value": 0
},
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 20
},
"support_enable": {
"default_value": true
}

14
resources/definitions/bq_hephestos_2.def.json
View file

@ -24,26 +24,14 @@
"machine_height": { "default_value": 220 },
"machine_heated_bed": { "default_value": false },
"machine_center_is_zero": { "default_value": false },
"material_print_temperature": { "default_value": 210 },
"material_bed_temperature": { "default_value": 0 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.2 },
"wall_line_count": { "default_value": 3 },
"wall_thickness": { "default_value": 1.2 },
"top_bottom_thickness": { "default_value": 1.2 },
"infill_sparse_density": { "default_value": 20 },
"infill_overlap": { "default_value": 15 },
"speed_print": { "default_value": 60 },
"speed_travel": { "default_value": 160 },
"speed_layer_0": { "default_value": 30 },
"speed_wall_x": { "default_value": 35 },
"speed_wall_0": { "default_value": 30 },
"speed_infill": { "default_value": 80 },
"speed_topbottom": { "default_value": 35 },
"skirt_brim_speed": { "default_value": 35 },
"skirt_line_count": { "default_value": 4 },
"skirt_brim_minimal_length": { "default_value": 30 },
"skirt_gap": { "default_value": 6 },
"cool_fan_full_at_height": { "default_value": 0.4 }
"skirt_gap": { "default_value": 6 }
}
}

24
resources/definitions/bq_hephestos_xl.def.json
View file

@ -53,33 +53,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"material_print_temperature": {
"default_value": 220
},
"material_bed_temperature": {
"default_value": 0
},
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 20
},
"support_enable": {
"default_value": true
}

24
resources/definitions/bq_witbox.def.json
View file

@ -54,33 +54,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"material_print_temperature": {
"default_value": 220
},
"material_bed_temperature": {
"default_value": 0
},
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 20
},
"support_enable": {
"default_value": true
}

36
resources/definitions/bq_witbox_2.def.json
View file

@ -41,21 +41,12 @@
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
"material_print_temperature": {
"default_value": 210
},
"material_bed_temperature": {
"default_value": 0
},
"layer_height": {
"default_value": 0.2
},
"layer_height_0": {
"default_value": 0.2
},
"wall_line_count": {
"default_value": 3
},
"wall_thickness": {
"default_value": 1.2
},
@ -65,33 +56,9 @@
"infill_sparse_density": {
"default_value": 20
},
"infill_overlap": {
"default_value": 15
},
"speed_print": {
"default_value": 60
},
"speed_travel": {
"default_value": 160
},
"speed_layer_0": {
"default_value": 30
},
"speed_wall_x": {
"default_value": 35
},
"speed_wall_0": {
"default_value": 30
},
"speed_infill": {
"default_value": 80
},
"speed_topbottom": {
"default_value": 35
},
"skirt_brim_speed": {
"default_value": 35
},
"skirt_line_count": {
"default_value": 4
},
@ -101,9 +68,6 @@
"skirt_gap": {
"default_value": 6
},
"cool_fan_full_at_height": {
"default_value": 0.4
},
"support_enable": {
"default_value": false
}

4
resources/definitions/builder_premium_large.def.json
View file

@ -35,8 +35,6 @@
"material_standby_temperature": { "value": "material_print_temperature" },
"switch_extruder_retraction_speeds": {"default_value": 15 },
"switch_extruder_retraction_speed": {"default_value": 15 },
"switch_extruder_prime_speed": {"default_value": 15 },
"switch_extruder_retraction_amount": {"value": 1 },
"speed_travel": { "value": "100" },
@ -85,8 +83,6 @@
"retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 15 },
"retraction_retract_speed": { "default_value": 15 },
"retraction_prime_speed": { "default_value": 15 },
"travel_retract_before_outer_wall": { "default_value": true },
"skin_overlap": { "value": "15" },
"adhesion_type": { "default_value": "skirt" },

4
resources/definitions/builder_premium_medium.def.json
View file

@ -35,8 +35,6 @@
"material_standby_temperature": { "value": "material_print_temperature" },
"switch_extruder_retraction_speeds": {"default_value": 15 },
"switch_extruder_retraction_speed": {"default_value": 15 },
"switch_extruder_prime_speed": {"default_value": 15 },
"switch_extruder_retraction_amount": {"value": 1 },
"speed_travel": { "value": "100" },
@ -85,8 +83,6 @@
"retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 15 },
"retraction_retract_speed": { "default_value": 15 },
"retraction_prime_speed": { "default_value": 15 },
"travel_retract_before_outer_wall": { "default_value": true },
"skin_overlap": { "value": "15" },
"adhesion_type": { "default_value": "skirt" },

4
resources/definitions/builder_premium_small.def.json
View file

@ -34,8 +34,6 @@
"material_standby_temperature": { "value": "material_print_temperature" },
"switch_extruder_retraction_speeds": {"default_value": 15 },
"switch_extruder_retraction_speed": {"default_value": 15 },
"switch_extruder_prime_speed": {"default_value": 15 },
"switch_extruder_retraction_amount": {"value": 1 },
"speed_travel": { "value": "100" },
@ -84,8 +82,6 @@
"retraction_amount": { "default_value": 3 },
"retraction_speed": { "default_value": 15 },
"retraction_retract_speed": { "default_value": 15 },
"retraction_prime_speed": { "default_value": 15 },
"travel_retract_before_outer_wall": { "default_value": true },
"skin_overlap": { "value": "15" },
"adhesion_type": { "default_value": "skirt" },

18
resources/definitions/cocoon_create_modelmaker.def.json
View file

@ -47,9 +47,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 220
},
"layer_height": {
"default_value": 0.10
},
@ -65,21 +62,6 @@
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 70
},
"speed_layer_0": {
"default_value": 20
},
"support_enable": {
"default_value": true
},

5
resources/definitions/creality_cr-x.def.json
View file

@ -32,7 +32,6 @@
"adhesion_type": { "default_value": "skirt" },
"gantry_height": { "value": "30" },
"speed_print": { "default_value": 60 },
"speed_travel": { "default_value": 120 },
"machine_max_acceleration_x": { "default_value": 500 },
"machine_max_acceleration_y": { "default_value": 500 },
"machine_max_acceleration_z": { "default_value": 100 },
@ -43,9 +42,7 @@
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" },
"machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" },
"material_print_temperature": { "default_value": 200 },
"wall_thickness": { "default_value": 1 },
"top_bottom_thickness": { "default_value": 1 },
"bottom_thickness": { "default_value": 1 }
"top_bottom_thickness": { "default_value": 1 }
}
}

4
resources/definitions/creatable_d3.def.json
View file

@ -27,14 +27,12 @@
"machine_max_feedrate_z": { "default_value": 300 },
"gantry_height": {"value": "43"},
"layer_height": { "default_value": 0.1 },
"relative_extrusion": { "default_value": false },
"relative_extrusion": { "value": "False" },
"retraction_combing": { "default_value": "off" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_retract_speed": { "default_value": 100 },
"retraction_speed": { "default_value": 100 },
"retraction_amount": { "default_value": 4.5 },
"retraction_prime_speed": { "default_value": 45 },
"machine_start_gcode": {
"default_value": "G21\nG90\nM82\nM106 S255\nG28\nG92 E0\nG1 Z100 F5000\nM190 S50\nM109 S200\nG1 X-135\nG1 Z0.3\nG92 E-32\nG1 E0 F1000\nG1 E50 F200\nG1 F1000\nG1 X-125\nG92 E0"
},

45
resources/definitions/cubicon_common.def.json
View file

@ -23,77 +23,34 @@
"travel_compensate_overlapping_walls_enabled": {
"default_value": false
},
"travel_compensate_overlapping_walls_0_enabled": {
"default_value": false
},
"travel_compensate_overlapping_walls_x_enabled": {
"default_value": false
},
"layer_height": {
"default_value": 0.2
},
"layer_height_0": {
"default_value": 0.2
},
"infill_line_width": {
"default_value": 0.6
},
"adhesion_type": {
"default_value": "raft"
},
"roofing_pattern": { "default_value": "lines" },
"top_bottom_pattern": { "default_value": "lines" },
"top_bottom_pattern_0": {
"default_value": "zigzag"
},
"fill_perimeter_gaps": { "default_value": "everywhere" },
"infill_pattern": {
"default_value": "zigzag"
},
"infill_sparse_density": { "default_value": 20 },
"infill_overlap": {
"default_value": 15
},
"infill_before_walls": { "default_value": false },
"infill_sparse_thickness": { "default_value": 0.2 },
"top_bottom_thickness": {
"default_value": 1.0
},
"top_thickness": {
"default_value": 1.0
},
"bottom_thickness": {
"default_value": 0.6,
"value": "top_bottom_thickness * 0.6"
},
"roofing_layer_count": {
"default_value": 1
},
"skin_preshrink": { "default_value": true },
"material_flow_layer_0": { "default_value": 100 },
"top_skin_preshrink": { "default_value": 1.2 },
"bottom_skin_preshrink": { "default_value": 1.2 },
"max_skin_angle_for_expansion": { "default_value": 90 },
"min_skin_width_for_expansion": { "default_value": 2.7475 },
"skin_angles": { "default_value": "[135,45]" },
"roofing_angles": { "default_value": "[135,45]" },
"coasting_volume": { "default_value": 0.032 },
"wall_thickness": { "default_value": 1.2 },
"wall_line_count": { "default_value": 3 },
"speed_wall_0": { "default_value": 25 },
"skin_overlap": { "default_value": 5 },
"cool_min_layer_time_fan_speed_max": { "default_value": 15 },
"cool_min_layer_time": { "default_value": 15 },
"support_roof_pattern": { "default_value": "zigzag" },
"support_bottom_pattern": { "default_value": "zigzag" },
"support_interface_pattern": { "default_value": "zigzag" },
"support_pattern": { "default_value": "zigzag" },
"retraction_amount": { "default_value": 1.5 },
"top_layers": {
"default_value": 5
},
"bottom_layers": {
"default_value": 3
}
"retraction_amount": { "default_value": 1.5 }
}
}

3
resources/definitions/dagoma_discoeasy200.def.json
View file

@ -52,9 +52,6 @@
"speed_print": {
"default_value": 60
},
"speed_travel": {
"default_value": 100
},
"retraction_amount": {
"default_value": 3.5
},

3
resources/definitions/dagoma_magis.def.json
View file

@ -55,9 +55,6 @@
"speed_print": {
"default_value": 40
},
"speed_travel": {
"default_value": 120
},
"retraction_amount": {
"default_value": 3.8
},

3
resources/definitions/dagoma_neva.def.json
View file

@ -55,9 +55,6 @@
"speed_print": {
"default_value": 40
},
"speed_travel": {
"default_value": 120
},
"retraction_amount": {
"default_value": 3.8
},

4
resources/definitions/delta_go.def.json
View file

@ -16,12 +16,8 @@
"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 },

5
resources/definitions/deltabot.def.json
View file

@ -15,15 +15,10 @@
},
"overrides": {
"speed_travel": { "default_value": 150 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"infill_sparse_density": { "default_value": 10 },
"speed_wall_x": { "default_value": 30 },
"speed_wall_0": { "default_value": 30 },
"speed_topbottom": { "default_value": 30 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 30 },
"speed_infill": { "default_value": 30 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": true },

12
resources/definitions/deltacomb.def.json
View file

@ -37,7 +37,7 @@
"retraction_amount" : { "default_value": 3.5 },
"retraction_speed" : { "default_value": 30 },
"retraction_combing" : { "default_value": "noskin" },
"travel_avoid_distance": { "default_value": 1, "value": "1" },
"travel_avoid_distance": { "value": "1" },
"speed_print" : { "default_value": 80 },
"speed_infill": { "value": "round(speed_print * 1.05, 0)" },
"speed_topbottom": { "value": "round(speed_print * 0.95, 0)" },
@ -45,7 +45,7 @@
"speed_wall_0": { "value": "30" },
"speed_wall_x": { "value": "speed_wall" },
"speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
"speed_travel": { "default_value": 150, "value": 150 },
"speed_travel": { "value": 150 },
"speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" },
"skirt_brim_speed": { "value": "speed_layer_0" },
"skirt_line_count": { "default_value": 3 },
@ -57,10 +57,10 @@
"support_z_distance": { "value": "layer_height * 2" },
"support_bottom_distance": { "value": "layer_height" },
"support_use_towers" : { "default_value": false },
"jerk_enabled": { "default_value": 1, "value": "1" },
"jerk_infill" : { "default_value": 5, "value": "5" },
"jerk_support" : { "default_value": 5, "value": "5" },
"acceleration_enabled": { "default_value": 1, "value": "1" },
"jerk_enabled": { "value": "True" },
"jerk_infill" : { "value": "5" },
"jerk_support" : { "value": "5" },
"acceleration_enabled": { "value": "1" },
"acceleration_travel" : { "value": 5000 },
"machine_max_feedrate_z" : { "default_value": 300 }
}

18
resources/definitions/easyarts_ares.def.json
View file

@ -49,27 +49,9 @@
"top_bottom_thickness": {
"default_value": 1
},
"bottom_thickness": {
"default_value": 1
},
"speed_print": {
"default_value": 75
},
"speed_infill": {
"default_value": 100
},
"speed_wall": {
"default_value": 25
},
"speed_topbottom": {
"default_value": 15
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 30
},
"support_enable": {
"default_value": true
}

40
resources/definitions/erzay3d.def.json
View file

@ -56,57 +56,17 @@
"ironing_pattern": { "default_value": "concentric" },
"ironing_flow": { "default_value": 7.0 },
"roofing_pattern": { "default_value": "concentric" },
"infill_sparse_density": { "default_value": 20 },
"infill_line_distance": { "default_value": 4 },
"default_material_print_temperature": { "default_value": 220 },
"material_print_temperature": { "default_value": 220 },
"material_print_temperature_layer_0": { "default_value": 220 },
"material_initial_print_temperature": { "default_value": 220 },
"material_final_print_temperature": { "default_value": 220 },
"retraction_amount": { "default_value": 6.5 },
"speed_print": { "default_value": 40 },
"speed_infill": { "default_value": 60 },
"speed_wall": { "default_value": 20 },
"speed_wall_0": { "default_value": 20 },
"speed_wall_x": { "default_value": 40 },
"speed_roofing": { "default_value": 20 },
"speed_topbottom": { "default_value": 20 },
"speed_support": { "default_value": 40 },
"speed_support_infill": { "default_value": 40 },
"speed_support_interface": { "default_value": 25 },
"speed_support_roof": { "default_value": 25 },
"speed_support_bottom": { "default_value": 25 },
"speed_prime_tower": { "default_value": 40 },
"speed_travel": { "default_value": 100 },
"speed_layer_0": { "default_value": 20 },
"speed_print_layer_0": { "default_value": 20 },
"speed_travel_layer_0": { "default_value": 80 },
"skirt_brim_speed": { "default_value": 20 },
"speed_equalize_flow_enabled": { "default_value": true },
"speed_equalize_flow_max": { "default_value": 100 },
"acceleration_print": { "default_value": 1000 },
"acceleration_infill": { "default_value": 3000 },
"acceleration_wall": { "default_value": 1000 },
"acceleration_wall_0": { "default_value": 1000 },
"acceleration_wall_x": { "default_value": 1000 },
"acceleration_roofing": { "default_value": 1000 },
"acceleration_topbottom": { "default_value": 1000 },
"acceleration_support": { "default_value": 1000 },
"acceleration_support_infill": { "default_value": 1000 },
"acceleration_support_interface": { "default_value": 1000 },
"acceleration_support_roof": { "default_value": 1000 },
"acceleration_support_bottom": { "default_value": 1000 },
"acceleration_prime_tower": { "default_value": 1000 },
"acceleration_travel": { "default_value": 1500 },
"acceleration_layer_0": { "default_value": 1000 },
"acceleration_print_layer_0": { "default_value": 1000 },
"acceleration_travel_layer_0": { "default_value": 1000 },
"acceleration_skirt_brim": { "default_value": 1000 },
"jerk_print": { "default_value": 10 },

4
resources/definitions/fabtotum.def.json
View file

@ -50,8 +50,8 @@
"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 },
"travel_avoid_distance": { "value": 1 },
"speed_travel": { "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" },

18
resources/definitions/fdmprinter.def.json
View file

@ -1190,6 +1190,18 @@
"value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
"initial_bottom_layers":
{
"label": "Initial Bottom Layers",
"description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.",
"minimum_value": "0",
"minimum_value_warning": "2",
"default_value": 6,
"type": "int",
"value": "bottom_layers",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
}
}
}
@ -4071,7 +4083,7 @@
"description": "The extruder train to use for printing the support. This is used in multi-extrusion.",
"type": "extruder",
"default_value": "0",
"value": "defaultExtruderPosition()",
"value": "int(defaultExtruderPosition())",
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -5038,7 +5050,7 @@
"description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.",
"type": "extruder",
"default_value": "0",
"value": "defaultExtruderPosition()",
"value": "int(defaultExtruderPosition())",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))",
"settable_per_mesh": false,
"settable_per_extruder": false
@ -6595,7 +6607,7 @@
"minimum_value_warning": "machine_nozzle_size * 3",
"maximum_value_warning": "100.0",
"type": "float",
"enabled": "support_conical_enabled and support_enable",
"enabled": "support_conical_enabled and support_enable and support_conical_angle > 0",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": true
},

2
resources/definitions/felixpro2dual.def.json
View file

@ -24,7 +24,6 @@
"layer_height": { "default_value": 0.15 },
"layer_height_0": { "default_value": 0.2 },
"speed_layer_0": { "default_value": 20},
"infill_sparse_density": { "default_value": 20 },
"wall_thickness": { "default_value": 1 },
@ -53,7 +52,6 @@
"machine_center_is_zero": { "default_value": false },
"speed_print": { "default_value": 80 },
"speed_travel": { "default_value": 200 },
"retraction_amount": { "default_value": 1 },
"retraction_speed": { "default_value": 50},

1
resources/definitions/felixtec4dual.def.json
View file

@ -39,7 +39,6 @@
"machine_center_is_zero": { "default_value": false },
"speed_print": { "default_value": 60 },
"speed_travel": { "default_value": 200 },
"retraction_amount": { "default_value": 1 },
"retraction_speed": { "default_value": 50},

8
resources/definitions/flsun_qq_s.def.json
View file

@ -33,14 +33,8 @@
"z_seam_type": {
"default_value": "back"
},
"top_thickness": {
"default_value": 5
},
"bottom_layers": {
"default_value": 4
},
"gantry_height": {
"default_value": 0
"value": "0"
},
"machine_nozzle_size": {
"default_value": 0.4

11
resources/definitions/geeetech_a30.def.json
View file

@ -42,9 +42,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_bed_temperature": {
"default_value": 60
},
"machine_nozzle_size": {
"default_value": 0.4
},
@ -60,12 +57,6 @@
"retraction_speed": {
"default_value": 25
},
"retraction_retract_speed": {
"default_value": 25
},
"retraction_prime_speed": {
"default_value": 25
},
"adhesion_type": {
"default_value": "skirt"
},
@ -86,7 +77,7 @@
]
},
"gantry_height": {
"default_value": 55
"value": "55"
},
"machine_max_feedrate_x": {
"default_value": 300

5
resources/definitions/gmax15plus.def.json
View file

@ -39,7 +39,6 @@
"adhesion_type": { "default_value": "skirt" },
"gantry_height": { "value": "50" },
"speed_print": { "default_value": 50 },
"speed_travel": { "default_value": 70 },
"machine_max_acceleration_x": { "default_value": 600 },
"machine_max_acceleration_y": { "default_value": 600 },
"machine_max_acceleration_z": { "default_value": 30 },
@ -50,9 +49,7 @@
"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 X/Y/Z\nM104 S{material_print_temperature} ; Preheat\nM109 S{material_print_temperature} ; Preheat\nG91 ;relative positioning\nG90 ;absolute positioning\nG1 Z25.0 F9000 ;raise nozzle 25mm\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\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
"material_print_temperature": { "default_value": 202 },
"wall_thickness": { "default_value": 1 },
"top_bottom_thickness": { "default_value": 1 },
"bottom_thickness": { "default_value": 1 }
"top_bottom_thickness": { "default_value": 1 }
}
}

5
resources/definitions/gmax15plus_dual.def.json
View file

@ -37,7 +37,6 @@
"adhesion_type": { "default_value": "skirt" },
"gantry_height": { "value": "50" },
"speed_print": { "default_value": 50 },
"speed_travel": { "default_value": 70 },
"machine_max_acceleration_x": { "default_value": 600 },
"machine_max_acceleration_y": { "default_value": 600 },
"machine_max_acceleration_z": { "default_value": 30 },
@ -48,9 +47,7 @@
"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 X/Y/Z\nM104 S{material_print_temperature} T0 ; Preheat Left Extruder\nM104 S{material_print_temperature} T1 ; Preheat Right Extruder\nM109 S{material_print_temperature} T0 ; Preheat Left Extruder\nM109 S{material_print_temperature} T1 ; Preheat Right Extruder\nG91 ;relative positioning\nG90 ;absolute positioning\nM218 T1 X34.3 Y0; Set 2nd extruder offset. This can be changed later if needed\nG1 Z25.0 F9000 ;raise nozzle 25mm\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 T0;Left extruder off\nM104 S0 T1; Right extruder 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-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" },
"material_print_temperature": { "default_value": 202 },
"wall_thickness": { "default_value": 1 },
"top_bottom_thickness": { "default_value": 1 },
"bottom_thickness": { "default_value": 1 }
"top_bottom_thickness": { "default_value": 1 }
}
}

13
resources/definitions/helloBEEprusa.def.json
View file

@ -26,28 +26,15 @@
"machine_height": { "default_value": 190 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"material_print_temperature": { "default_value": 200 },
"material_bed_temperature": { "default_value": 60 },
"line_width": { "default_value": 0.48 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.2 },
"wall_line_count": { "default_value": 3 },
"wall_thickness": { "default_value": 1.2 },
"top_bottom_thickness": { "default_value": 1.2 },
"infill_sparse_density": { "default_value": 20 },
"infill_overlap": { "default_value": 15 },
"speed_print": { "default_value": 60 },
"speed_travel": { "default_value": 160 },
"speed_layer_0": { "default_value": 30 },
"speed_wall_x": { "default_value": 35 },
"speed_wall_0": { "default_value": 30 },
"speed_infill": { "default_value": 60 },
"speed_topbottom": { "default_value": 20 },
"skirt_brim_speed": { "default_value": 35 },
"skirt_line_count": { "default_value": 4 },
"skirt_brim_minimal_length": { "default_value": 30 },
"skirt_gap": { "default_value": 6 },
"cool_fan_full_at_height": { "default_value": 0.4 },
"retraction_speed": { "default_value": 15.0},
"retraction_amount": { "default_value": 1.5}
}

26
resources/definitions/innovo_inventor.def.json
View file

@ -61,36 +61,10 @@
"top_bottom_thickness": {
"default_value": 1.2
},
"material_print_temperature": {
"default_value": 205
},
"material_bed_temperature": {
"default_value": 60
},
"speed_print": {
"default_value": 50
},
"speed_wall_0": {
"default_value": 25
},
"speed_wall_x": {
"default_value": 40
},
"speed_infill": {
"default_value": 80
},
"speed_topbottom": {
"default_value": 30
},
"speed_support_interface":
{
"default_value": 20
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 30.0,
"minimum_value": 0.1
}
}

21
resources/definitions/jgaurora_a1.def.json
View file

@ -47,12 +47,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 215
},
"material_bed_temperature": {
"default_value": 67
},
"layer_height_0": {
"default_value": 0.12
},
@ -62,21 +56,6 @@
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 12
},
"support_enable": {
"default_value": true
},

21
resources/definitions/jgaurora_a3s.def.json
View file

@ -47,12 +47,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 210
},
"material_bed_temperature": {
"default_value": 65
},
"layer_height_0": {
"default_value": 0.12
},
@ -62,21 +56,6 @@
"speed_print": {
"default_value": 35
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 30
},
"speed_topbottom": {
"default_value": 20
},
"speed_travel": {
"default_value": 100
},
"speed_layer_0": {
"default_value": 12
},
"support_enable": {
"default_value": true
},

21
resources/definitions/jgaurora_a5.def.json
View file

@ -49,12 +49,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 215
},
"material_bed_temperature": {
"default_value": 67
},
"layer_height_0": {
"default_value": 0.12
},
@ -64,21 +58,6 @@
"speed_print": {
"default_value": 40
},
"speed_infill": {
"default_value": 40
},
"speed_wall": {
"default_value": 35
},
"speed_topbottom": {
"default_value": 35
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 12
},
"support_enable": {
"default_value": true
},

21
resources/definitions/jgaurora_jgmaker_magic.def.json
View file

@ -47,12 +47,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 200
},
"material_bed_temperature": {
"default_value": 60
},
"layer_height_0": {
"default_value": 0.2
},
@ -62,21 +56,6 @@
"speed_print": {
"default_value": 60
},
"speed_infill": {
"default_value": 60
},
"speed_wall": {
"default_value": 30
},
"speed_topbottom": {
"default_value": 45
},
"speed_travel": {
"default_value": 125
},
"speed_layer_0": {
"default_value": 30
},
"support_enable": {
"default_value": true
},

21
resources/definitions/jgaurora_z_603s.def.json
View file

@ -47,12 +47,6 @@
"material_diameter": {
"default_value": 1.75
},
"material_print_temperature": {
"default_value": 210
},
"material_bed_temperature": {
"default_value": 55
},
"layer_height_0": {
"default_value": 0.2
},
@ -62,21 +56,6 @@
"speed_print": {
"default_value": 60
},
"speed_infill": {
"default_value": 60
},
"speed_wall": {
"default_value": 30
},
"speed_topbottom": {
"default_value": 45
},
"speed_travel": {
"default_value": 125
},
"speed_layer_0": {
"default_value": 20
},
"support_enable": {
"default_value": true
},

11
resources/definitions/julia.def.json
View file

@ -21,25 +21,14 @@
"machine_end_gcode": {
"default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n"
},
"material_bed_temperature": { "default_value": 100 },
"layer_height": { "default_value": 0.2 },
"support_angle": { "default_value": 30 },
"infill_overlap": { "default_value": 30 },
"layer_height_0": { "default_value": 0.2 },
"speed_print": { "default_value": 80 },
"speed_wall_0": { "default_value": 30 },
"speed_travel": { "default_value": 150 },
"brim_line_count": { "default_value": 15 },
"skin_overlap": { "default_value": 30 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"bottom_thickness": { "default_value": 0.8 },
"retraction_amount": { "default_value": 3 },
"speed_topbottom": { "default_value": 80 },
"material_print_temperature": { "default_value": 230 },
"support_pattern": { "default_value": "grid" },
"speed_infill": { "default_value": 80 },
"infill_sparse_density": { "default_value": 10 },
"top_thickness": { "default_value": 0.8 },
"machine_extruder_count": { "default_value": 1 },
"retraction_combing": { "default_value": "off" },
"machine_heated_bed": { "default_value": true },

15
resources/definitions/makeit_pro_l.def.json
View file

@ -77,27 +77,12 @@
"retraction_amount": {
"default_value": 6
},
"retraction_min_travel": {
"default_value": 1.5
},
"speed_travel": {
"default_value": 150
},
"speed_print": {
"default_value": 60
},
"wall_thickness": {
"default_value": 1.2
},
"bottom_thickness": {
"default_value": 0.2
},
"speed_layer_0": {
"default_value": 20
},
"speed_print_layer_0": {
"default_value": 20
},
"cool_min_layer_time_fan_speed_max": {
"default_value": 5
},

15
resources/definitions/makeit_pro_m.def.json
View file

@ -77,27 +77,12 @@
"retraction_amount": {
"default_value": 6
},
"retraction_min_travel": {
"default_value": 1.5
},
"speed_travel": {
"default_value": 150
},
"speed_print": {
"default_value": 60
},
"wall_thickness": {
"default_value": 1.2
},
"bottom_thickness": {
"default_value": 0.2
},
"speed_layer_0": {
"default_value": 20
},
"speed_print_layer_0": {
"default_value": 20
},
"cool_min_layer_time_fan_speed_max": {
"default_value": 5
},

66
resources/definitions/maker_starter.def.json
View file

@ -53,57 +53,15 @@
"layer_height_0": {
"default_value": 0.2
},
"wall_line_count": {
"default_value": 2
},
"top_layers": {
"default_value": 4
},
"bottom_layers": {
"default_value": 4
},
"speed_print": {
"default_value": 50
},
"speed_wall": {
"default_value": 30
},
"speed_wall_0": {
"default_value": 30
},
"speed_wall_x": {
"default_value": 30
},
"speed_topbottom": {
"default_value": 50
},
"speed_support": {
"default_value": 50
},
"speed_travel": {
"default_value": 120
},
"speed_layer_0": {
"default_value": 20
},
"skirt_brim_speed": {
"default_value": 15
},
"speed_slowdown_layers": {
"default_value": 4
},
"infill_sparse_density": {
"default_value": 20
},
"cool_fan_speed_min": {
"default_value": 50
},
"cool_fan_speed_max": {
"default_value": 100
},
"cool_fan_full_layer": {
"default_value": 4
},
"cool_min_layer_time": {
"default_value": 5
},
@ -122,12 +80,6 @@
"support_z_distance": {
"default_value": 0.2
},
"support_top_distance": {
"default_value": 0.2
},
"support_bottom_distance": {
"default_value": 0.24
},
"support_pattern": {
"default_value": "ZigZag"
},
@ -140,24 +92,6 @@
"skirt_brim_minimal_length": {
"default_value": 100
},
"raft_base_line_spacing": {
"default_value": 2
},
"raft_base_thickness": {
"default_value": 0.3
},
"raft_base_line_width": {
"default_value": 2
},
"raft_base_speed": {
"default_value": 15
},
"raft_interface_thickness": {
"default_value": 0.24
},
"raft_interface_line_width": {
"default_value": 0.6
},
"raft_airgap": {
"default_value": 0.2
},

2
resources/definitions/makerbotreplicator.def.json
View file

@ -18,9 +18,7 @@
"overrides": {
"prime_tower_size": { "default_value": 10.0 },
"infill_sparse_density": { "default_value": 10 },
"speed_travel": { "default_value": 150 },
"layer_height": { "default_value": 0.15 },
"material_print_temperature": { "default_value": 220 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },

2
resources/definitions/malyan_m200.def.json
View file

@ -30,8 +30,6 @@
"speed_wall_x": { "value": "speed_print" },
"speed_support": { "value": "speed_wall_0" },
"speed_layer_0": { "value": "round(speed_print / 2.0, 2)" },
"speed_travel": { "default_value": 50 },
"speed_travel_layer_0": { "default_value": 40 },
"speed_infill": { "value": "speed_print" },
"speed_topbottom": {"value": "speed_print / 2"},

10
resources/definitions/mankati_fullscale_xt_plus.def.json
View file

@ -41,23 +41,15 @@
"layer_height": { "default_value": 0.2 },
"wall_thickness": { "default_value": 0.8 },
"top_bottom_thickness": { "default_value": 0.3 },
"material_print_temperature": { "default_value": 195 },
"material_bed_temperature": { "default_value": 60 },
"retraction_enable": { "default_value": true },
"retraction_speed": { "default_value": 50 },
"retraction_amount": { "default_value": 0.8 },
"retraction_hop": { "default_value": 0.075 },
"speed_print": { "default_value": 60 },
"speed_infill": { "default_value": 100 },
"speed_topbottom": { "default_value": 15 },
"speed_travel": { "default_value": 150 },
"speed_layer_0": {
"minimum_value": "0.1",
"default_value": 15.0
"minimum_value": "0.1"
},
"infill_overlap": { "default_value": 10 },
"cool_fan_enabled": { "default_value": false },
"cool_fan_speed": { "default_value": 0 },
"skirt_line_count": { "default_value": 3 },
"skirt_gap": { "default_value": 4 },
"skirt_brim_minimal_length": { "default_value": 200 }

3
resources/definitions/ord.def.json
View file

@ -19,12 +19,9 @@
},
"overrides": {
"material_bed_temperature": { "default_value": 60 },
"prime_tower_size": { "default_value": 7.0710678118654755 },
"infill_sparse_density": { "default_value": 15 },
"speed_travel": { "default_value": 150 },
"layer_height": { "default_value": 0.3 },
"material_print_temperature": { "default_value": 240 },
"machine_extruder_count": { "default_value": 5 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },

1
resources/definitions/printrbot_play.def.json
View file

@ -29,7 +29,6 @@
"machine_head_with_fans_polygon": { "default_value": [[-32,999],[37,999],[37,-32],[-32,-32]] },
"gantry_height": { "value": "55" },
"speed_print": { "default_value": 50 },
"speed_travel": { "default_value": 55 },
"machine_max_feedrate_x": {"default_value": 125},
"machine_max_feedrate_y": {"default_value": 125},
"machine_max_feedrate_z": { "default_value": 5 },

3
resources/definitions/prusa_i3_mk2.def.json
View file

@ -22,13 +22,10 @@
"machine_height": { "default_value": 200 },
"machine_depth": { "default_value": 210 },
"machine_center_is_zero": { "default_value": false },
"material_bed_temperature": { "default_value": 55 },
"layer_height": { "default_value": 0.1 },
"layer_height_0": { "default_value": 0.15 },
"retraction_amount": { "default_value": 0.8 },
"retraction_speed": { "default_value": 35 },
"retraction_retract_speed": { "default_value": 35 },
"retraction_prime_speed": { "default_value": 35 },
"adhesion_type": { "default_value": "skirt" },
"machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] },
"gantry_height": { "value": "28" },

6
resources/definitions/punchtec_connect_xl.def.json
View file

@ -17,15 +17,9 @@
"overrides": {
"machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] },
"speed_travel": { "default_value": 150 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"speed_wall_x": { "default_value": 40 },
"speed_wall_0": { "default_value": 40 },
"speed_topbottom": { "default_value": 40 },
"layer_height": { "default_value": 0.2 },
"material_print_temperature": { "default_value": 195 },
"speed_print": { "default_value": 40 },
"speed_infill": { "default_value": 40 },
"machine_extruder_count": { "default_value": 2 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },

10
resources/definitions/rigid3d.def.json
View file

@ -25,23 +25,13 @@
"skirt_gap": { "default_value": 5.0 },
"cool_min_layer_time": { "default_value": 10 },
"prime_tower_size": { "default_value": 7.745966692414834 },
"speed_wall_x": { "default_value": 40 },
"speed_travel": { "default_value": 100 },
"bottom_thickness": { "default_value": 0.75 },
"layer_height_0": { "default_value": 0.25 },
"support_angle": { "default_value": 45 },
"material_bed_temperature": { "default_value": 100 },
"top_thickness": { "default_value": 0.75 },
"material_print_temperature": { "default_value": 235 },
"retraction_speed": { "default_value": 60.0 },
"wall_thickness": { "default_value": 0.8 },
"retraction_min_travel": { "default_value": 2 },
"speed_wall_0": { "default_value": 30 },
"retraction_amount": { "default_value": 1 },
"speed_topbottom": { "default_value": 30 },
"layer_height": { "default_value": 0.25 },
"speed_print": { "default_value": 40 },
"speed_infill": { "default_value": 40 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },

8
resources/definitions/rigid3d_3rdgen.def.json
View file

@ -25,20 +25,12 @@
"cool_min_layer_time": { "default_value": 10 },
"prime_tower_size": { "default_value": 7.745966692414834 },
"skirt_gap": { "default_value": 5.0 },
"speed_travel": { "default_value": 120 },
"bottom_thickness": { "default_value": 0.75 },
"layer_height_0": { "default_value": 0.25 },
"support_angle": { "default_value": 45 },
"material_bed_temperature": { "default_value": 100 },
"retraction_min_travel": { "default_value": 2 },
"speed_wall_0": { "default_value": 30 },
"retraction_speed": { "default_value": 60.0 },
"wall_thickness": { "default_value": 0.8 },
"material_print_temperature": { "default_value": 235 },
"retraction_amount": { "default_value": 1 },
"speed_topbottom": { "default_value": 25 },
"layer_height": { "default_value": 0.25 },
"top_thickness": { "default_value": 0.75 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },

8
resources/definitions/rigid3d_hobby.def.json
View file

@ -17,25 +17,17 @@
"overrides": {
"machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] },
"prime_tower_size": { "default_value": 8.660254037844387 },
"speed_travel": { "default_value": 40 },
"skirt_gap": { "default_value": 5.0 },
"cool_min_layer_time": { "default_value": 15 },
"support_pattern": { "default_value": "grid" },
"layer_height_0": { "default_value": 0.25 },
"speed_wall_x": { "default_value": 30 },
"skirt_line_count": { "default_value": 2 },
"support_angle": { "default_value": 45 },
"speed_topbottom": { "default_value": 20 },
"material_print_temperature": { "default_value": 205 },
"retraction_speed": { "default_value": 80 },
"wall_thickness": { "default_value": 0.8 },
"retraction_min_travel": { "default_value": 2 },
"speed_wall_0": { "default_value": 20 },
"retraction_amount": { "default_value": 2 },
"speed_layer_0": { "default_value": 15 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 30 },
"speed_infill": { "default_value": 30 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": false },
"machine_center_is_zero": { "default_value": false },

5
resources/definitions/rigid3d_mucit.def.json
View file

@ -76,14 +76,9 @@
"default_value": true
},
"cool_fan_speed": {
"default_value": 100,
"value": "100"
},
"cool_fan_speed_min": {
"default_value": 0
},
"cool_fan_full_at_height": {
"default_value": 0.5,
"value": "0.5"
},
"support_z_distance": {

10
resources/definitions/rigid3d_zero.def.json
View file

@ -24,21 +24,11 @@
"machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] },
"support_pattern": { "default_value": "grid" },
"cool_min_layer_time": { "default_value": 10 },
"speed_travel": { "default_value": 80 },
"support_angle": { "default_value": 45 },
"retraction_min_travel": { "default_value": 2 },
"speed_wall_0": { "default_value": 20 },
"speed_layer_0": { "default_value": 15 },
"speed_infill": { "default_value": 30 },
"speed_topbottom": { "default_value": 30 },
"prime_tower_size": { "default_value": 7.745966692414834 },
"skirt_line_count": { "default_value": 2 },
"speed_wall_x": { "default_value": 30 },
"bottom_thickness": { "default_value": 0.75 },
"layer_height_0": { "default_value": 0.25 },
"top_thickness": { "default_value": 0.75 },
"wall_thickness": { "default_value": 0.8 },
"material_print_temperature": { "default_value": 195 },
"retraction_amount": { "default_value": 1.5 },
"skirt_gap": { "default_value": 5.0 },
"layer_height": { "default_value": 0.25 },

8
resources/definitions/rigid3d_zero2.def.json
View file

@ -44,9 +44,6 @@
"material_print_temperature": {
"value": 235
},
"material_bed_temperature": {
"default_value": 100
},
"speed_print": {
"default_value": 40
},
@ -90,14 +87,9 @@
"default_value": false
},
"cool_fan_speed": {
"default_value": 50,
"value": 50
},
"cool_fan_speed_min": {
"default_value": 0
},
"cool_fan_full_at_height": {
"default_value": 1.0,
"value": 1.0
},
"support_z_distance": {

22
resources/definitions/rigidbot.def.json
View file

@ -49,37 +49,15 @@
"top_bottom_thickness": {
"default_value": 0.3
},
"material_print_temperature": {
"default_value": 195
},
"material_bed_temperature": {
"default_value": 60
},
"speed_print": {
"default_value": 60
},
"speed_infill": {
"default_value": 100
},
"speed_topbottom": {
"default_value": 15
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 15,
"minimum_value": "0.1"
},
"infill_overlap": {
"default_value": 10
},
"cool_fan_enabled": {
"default_value": false
},
"cool_fan_speed": {
"default_value": 0
},
"skirt_line_count": {
"default_value": 3
},

22
resources/definitions/rigidbot_big.def.json
View file

@ -49,37 +49,15 @@
"top_bottom_thickness": {
"default_value": 0.3
},
"material_print_temperature": {
"default_value": 195
},
"material_bed_temperature": {
"default_value": 60
},
"speed_print": {
"default_value": 60
},
"speed_infill": {
"default_value": 100
},
"speed_topbottom": {
"default_value": 15
},
"speed_travel": {
"default_value": 150
},
"speed_layer_0": {
"default_value": 15,
"minimum_value": "0.1"
},
"infill_overlap": {
"default_value": 10
},
"cool_fan_enabled": {
"default_value": false
},
"cool_fan_speed": {
"default_value": 0
},
"skirt_line_count": {
"default_value": 3
},

12
resources/definitions/robo_3d_r1.def.json
View file

@ -22,28 +22,16 @@
"default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n"
},
"cool_min_layer_time": { "default_value": 7 },
"speed_topbottom": { "default_value": 40 },
"retraction_speed": { "default_value": 50 },
"layer_0_z_overlap": { "default_value": 0.2 },
"cool_min_speed": { "default_value": 19 },
"material_bed_temperature": { "default_value": 60 },
"support_angle": { "default_value": 50 },
"speed_layer_0": { "default_value": 30 },
"line_width": { "default_value": 0.4 },
"speed_infill": { "default_value": 60 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"support_enable": { "default_value": true },
"cool_fan_full_at_height": { "default_value": 0.1 },
"bottom_thickness": { "default_value": 1.2 },
"raft_airgap": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.15 },
"top_thickness": { "default_value": 1.2 },
"speed_wall_0": { "default_value": 40 },
"retraction_min_travel": { "default_value": 5 },
"material_flow": { "default_value": 100 },
"infill_sparse_density": { "default_value": 10 },
"wall_thickness": { "default_value": 1.2 },
"material_print_temperature": { "default_value": 190 },
"retraction_amount": { "default_value": 3 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 40 },

4
resources/definitions/seemecnc_artemis.def.json
View file

@ -27,13 +27,11 @@
"machine_name": { "default_value": "Artemis" },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 290 },
"relative_extrusion": { "default_value": false },
"relative_extrusion": { "value": "False" },
"retraction_amount": { "default_value": 3.2 },
"retraction_combing": { "default_value": "off" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_prime_speed": { "default_value": 45 },
"retraction_retract_speed": { "default_value": 45 },
"retraction_speed": { "default_value": 45 },
"machine_start_gcode": {
"default_value": "G28\nG1 Z15.0 F10000\nG92 E0"

4
resources/definitions/seemecnc_v32.def.json
View file

@ -27,13 +27,11 @@
"machine_name": { "default_value": "Rostock Max V3.2" },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 265 },
"relative_extrusion": { "default_value": false },
"relative_extrusion": { "value": "False" },
"retraction_amount": { "default_value": 3.2 },
"retraction_combing": { "default_value": "off" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_prime_speed": { "default_value": 45 },
"retraction_retract_speed": { "default_value": 45 },
"retraction_speed": { "default_value": 45 },
"machine_start_gcode": {
"default_value": "G28\nG1 Z15.0 F10000\nG92 E0"

2
resources/definitions/strateo3d.def.json
View file

@ -32,7 +32,7 @@
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] },
"gantry_height": { "default_value": 40 },
"gantry_height": { "value": "40" },
"machine_extruder_count": { "default_value": 2 },
"machine_gcode_flavor": { "default_value": "Marlin" },
"machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" },

3
resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
View file

@ -55,9 +55,6 @@
"line_width": {
"value": "round(machine_nozzle_size * 0.875, 2)"
},
"speed_layer_0": {
"default_value": 10
},
"speed_support": {
"value": "speed_wall_0"
},

1
resources/definitions/tam.def.json
View file

@ -37,7 +37,6 @@
"machine_center_is_zero": { "default_value": false },
"speed_print": { "default_value": 60 },
"speed_travel": { "default_value": 200 },
"retraction_amount": { "default_value": 0.4 },
"retraction_speed": { "default_value": 35},

5
resources/definitions/tizyx_evy.def.json
View file

@ -50,13 +50,8 @@
"fill_outline_gaps": { "default_value": true},
"infill_sparse_density": { "default_value": 15},
"retraction_amount": { "default_value": 2.5},
"retraction_min_travel": { "default_value": 2},
"retraction_speed": { "default_value": 30},
"speed_print": { "default_value": 60},
"speed_topbottom": { "default_value": 50},
"speed_wall_0": { "default_value": 40},
"top_layers": { "default_value": 4},
"wall_line_count": { "default_value": 2},
"cool_min_layer_time": { "default_value": 11},
"layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
"layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },

3
resources/definitions/ubuild-3d_mr_bot_280.def.json
View file

@ -24,12 +24,9 @@
"machine_height": { "default_value": 275 },
"machine_depth": { "default_value": 275 },
"machine_center_is_zero": { "default_value": false },
"material_bed_temperature": { "default_value": 70 },
"layer_height_0": { "default_value": 0.1 },
"retraction_amount": { "default_value": 2 },
"retraction_speed": { "default_value": 50 },
"retraction_retract_speed": { "default_value": 50 },
"retraction_prime_speed": { "default_value": 30 },
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },

3
resources/definitions/ultimaker2.def.json
View file

@ -88,9 +88,6 @@
},
"machine_acceleration": {
"default_value": 3000
},
"machine_nozzle_temp_enabled": {
"default_value": false
}
}
}

3
resources/definitions/ultimaker2_plus.def.json
View file

@ -37,9 +37,6 @@
"line_width": {
"value": "round(machine_nozzle_size * 0.875, 2)"
},
"speed_layer_0": {
"default_value": 20
},
"speed_support": {
"value": "speed_wall_0"
},

6
resources/definitions/vertex_k8400.def.json
View file

@ -20,12 +20,6 @@
"machine_heated_bed": {
"default_value": true
},
"material_bed_temperature": {
"default_value": 0
},
"material_bed_temperature_layer_0": {
"default_value": 0
},
"machine_width": {
"default_value": 200
},

6
resources/definitions/vertex_k8400_dual.def.json
View file

@ -18,12 +18,6 @@
"machine_heated_bed": {
"default_value": true
},
"material_bed_temperature": {
"default_value": 0
},
"material_bed_temperature_layer_0": {
"default_value": 0
},
"machine_width": {
"default_value": 223.7
},

6
resources/definitions/vertex_nano_k8600.def.json
View file

@ -19,12 +19,6 @@
"machine_heated_bed": {
"default_value": false
},
"material_bed_temperature": {
"default_value": 0
},
"material_bed_temperature_layer_0": {
"default_value": 0
},
"machine_width": {
"default_value": 80
},

2
resources/definitions/wanhao_d9.def.json
View file

@ -31,8 +31,6 @@
"support_angle": { "default_value": 60 },
"support_enable": { "default_value": true },
"layer_height_0": { "default_value": 0.15 },
"top_thickness": { "default_value": 0.6 },
"material_print_temperature": { "default_value": 190 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 30 },
"adhesion_type": { "default_value": "raft" },

2
resources/definitions/zone3d_printer.def.json
View file

@ -16,9 +16,7 @@
"overrides": {
"prime_tower_size": { "default_value": 10.350983390135314 },
"material_print_temperature": { "default_value": 260 },
"layer_height": { "default_value": 0.14 },
"speed_travel": { "default_value": 150 },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },

13
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -10,6 +10,8 @@ import QtQuick.Dialogs 1.2
import UM 1.2 as UM
import Cura 1.0 as Cura
// An expandable list of materials. Includes both the header (this file) and the items (brandMaterialList)
Item
{
id: brand_section
@ -50,9 +52,8 @@ Item
verticalAlignment: Text.AlignVCenter
leftPadding: (UM.Theme.getSize("default_margin").width / 2) | 0
}
Button
Item
{
text: ""
implicitWidth: UM.Theme.getSize("favorites_button").width
implicitHeight: UM.Theme.getSize("favorites_button").height
UM.RecolorImage
@ -67,10 +68,6 @@ Item
color: "black"
source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
}
style: ButtonStyle
{
background: Item { }
}
}
}
MouseArea
@ -99,7 +96,7 @@ Item
id: brandMaterialList
anchors.top: brand_header.bottom
width: parent.width
anchors.left: parent.left
anchors.left: parent ? parent.left : undefined
height: brand_section.expanded ? childrenRect.height : 0
visible: brand_section.expanded
@ -109,7 +106,7 @@ Item
delegate: Loader
{
id: loader
width: parent.width
width: parent ? parent.width : 0
property var element: model
sourceComponent: hasMaterialTypes ? materialsTypeSection : materialSlot
}

2
resources/qml/Preferences/Materials/MaterialsSlot.qml
View file

@ -10,6 +10,8 @@ import QtQuick.Dialogs 1.2
import UM 1.2 as UM
import Cura 1.0 as Cura
// A single material row, typically used in a MaterialsBrandSection
Rectangle
{
id: materialSlot

24
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -20,8 +20,8 @@ Item
property var expanded: materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1
property var colorsModel: materialType != null ? materialType.colors: null
height: childrenRect.height
width: parent.width
anchors.left: parent.left
width: parent ? parent.width :undefined
anchors.left: parent ? parent.left : undefined
Rectangle
{
id: material_type_header_background
@ -55,7 +55,7 @@ Item
leftPadding: UM.Theme.getSize("default_margin").width
anchors
{
left: parent.left
left: parent ? parent.left : undefined
}
Label
{
@ -65,33 +65,25 @@ Item
id: material_type_name
verticalAlignment: Text.AlignVCenter
}
Button
Item // this one causes lots of warnings
{
text: ""
implicitWidth: UM.Theme.getSize("favorites_button").width
implicitHeight: UM.Theme.getSize("favorites_button").height
UM.RecolorImage {
anchors
{
verticalCenter: parent.verticalCenter
horizontalCenter: parent.horizontalCenter
verticalCenter: parent ? parent.verticalCenter : undefined
horizontalCenter: parent ? parent.horizontalCenter : undefined
}
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
color: "black"
source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
}
style: ButtonStyle
{
background: Rectangle
{
anchors.fill: parent
color: "transparent"
}
}
}
}
MouseArea
MouseArea // causes lots of warnings
{
anchors.fill: material_type_header
onPressed:

21
resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
View file

@ -70,12 +70,31 @@ Popup
{
id: headerLabel
text: model.name
color: UM.Theme.getColor("text_inactive")
renderType: Text.NativeRendering
width: parent.width
height: visible ? contentHeight: 0
enabled: false
visible: qualitiesList.visibleChildren.length > 0
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
MouseArea // tooltip hover area
{
anchors.fill: parent
hoverEnabled: true
enabled: model.description !== undefined
acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
onEntered:
{
base.showTooltip(
headerLabel,
Qt.point(- UM.Theme.getSize("default_margin").width, 0),
model.description
)
}
onExited: base.hideTooltip()
}
}
Column

18
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -163,6 +163,24 @@ Item
isCheckedFunction: checkedFunction
}
MouseArea // tooltip hover area
{
anchors.fill: parent
hoverEnabled: true
enabled: model.description !== undefined
acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
onEntered:
{
base.showTooltip(
intentCategoryLabel,
Qt.point(-(intentCategoryLabel.x - qualityRow.x) - UM.Theme.getSize("thick_margin").width, 0),
model.description
)
}
onExited: base.hideTooltip()
}
}
}

71
tests/Settings/TestDefinitionContainer.py
View file

@ -1,23 +1,22 @@
# Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import json # To check files for unnecessarily overridden properties.
import os
import os.path
import pytest #This module contains automated tests.
from typing import Any, Dict
import uuid
import UM.Settings.ContainerRegistry #To create empty instance containers.
import UM.Settings.ContainerStack #To set the container registry the container stacks use.
from UM.Settings.DefinitionContainer import DefinitionContainer #To check against the class of DefinitionContainer.
import os
import os.path
import uuid
from UM.Resources import Resources
Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources")))
machine_filepaths = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions"))
machine_filepaths = sorted(os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions")))
all_meshes = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "meshes"))
all_images = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "images"))
@ -52,3 +51,61 @@ def assertIsDefinitionValid(definition_container, path, file_name):
if "platform_texture" in metadata[0]:
assert metadata[0]["platform_texture"] in all_images
## Tests whether setting values are not being hidden by parent containers.
#
# When a definition container defines a "default_value" but inherits from a
# definition that defines a "value", the "default_value" is ineffective. This
# test fails on those things.
@pytest.mark.parametrize("file_name", machine_filepaths)
def test_validateOverridingDefaultValue(file_name):
definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", file_name)
with open(definition_path, encoding = "utf-8") as f:
doc = json.load(f)
if "inherits" not in doc:
return # We only want to check for documents where the inheritance overrides the children. If there's no inheritance, this can't happen so it's fine.
if "overrides" not in doc:
return # No settings are being overridden. No need to check anything.
parent_settings = getInheritedSettings(doc["inherits"])
for key, val in doc["overrides"].items():
if "value" in parent_settings[key]:
assert "default_value" not in val, "Unnecessary default_value for {key} in {file_name}".format(key = key, file_name = file_name) # If there is a value in the parent settings, then the default_value is not effective.
def getInheritedSettings(definition_id: str) -> Dict[str, Any]:
definition_path = os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions", definition_id + ".def.json")
with open(definition_path, encoding = "utf-8") as f:
doc = json.load(f)
result = {}
if "inherits" in doc: # Recursive inheritance.
result.update(getInheritedSettings(doc["inherits"]))
if "settings" in doc:
result.update(flattenSettings(doc["settings"]))
if "overrides" in doc:
result = merge_dicts(result, doc["overrides"])
return result
def flattenSettings(settings) -> Dict[str, Any]:
result = {}
for entry, contents in settings.items():
if "children" in contents:
result.update(flattenSettings(contents["children"]))
del contents["children"]
result[entry] = contents
return result
def merge_dicts(base: Dict[str, Any], overrides: Dict[str, Any]) -> Dict[str, Any]:
result = {}
result.update(base)
for key, val in overrides.items():
if key not in result:
result[key] = val
continue
if isinstance(result[key], dict) and isinstance(val, dict):
result[key] = merge_dicts(result[key], val)
else:
result[key] = val
return result