diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-03-19 16:48:45 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-03-19 16:48:45 +0300 |
| commit | 44b61d370f8af0f0ead0baa67cfa780a948ac1e6 (patch) | |
| tree | 9d8c1257ef16cc46fa211ab3b8e63c32250a5971 | |
| parent | df0a3143d2294c94d08cbe852ae288cd494f45cf (diff) | |
| parent | 90ed7ac1848deac467f448d814105c5799310ccf (diff) | |
Merge branch 'master' of github.com:Ultimaker/Cura
76 files changed, 1751 insertions, 469 deletions
diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index bcc690bed4..c16051d187 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -7,7 +7,7 @@ DEFAULT_CURA_APP_NAME = "cura" DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" -DEFAULT_CURA_BUILD_TYPE = "enterprise" +DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for diff --git a/cura/UI/TextManager.py b/cura/UI/TextManager.py index 86838a0b48..dbe7940f26 100644 --- a/cura/UI/TextManager.py +++ b/cura/UI/TextManager.py @@ -28,7 +28,11 @@ class TextManager(QObject): def _loadChangeLogText(self) -> str:
# Load change log texts and organize them with a dict
- file_path = Resources.getPath(Resources.Texts, "change_log.txt")
+ try:
+ file_path = Resources.getPath(Resources.Texts, "change_log.txt")
+ except FileNotFoundError:
+ # I have no idea how / when this happens, but we're getting crash reports about it.
+ return ""
change_logs_dict = {} # type: Dict[Version, Dict[str, List[str]]]
with open(file_path, "r", encoding = "utf-8") as f:
open_version = None # type: Optional[Version]
diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 20eb9b29dc..b41f301e06 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -86,7 +86,7 @@ class ThreeMFReader(MeshReader): ## Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node. # \returns Scene node. - def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode) -> Optional[SceneNode]: + def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: self._object_count += 1 node_name = "Object %s" % self._object_count @@ -104,6 +104,10 @@ class ThreeMFReader(MeshReader): vertices = numpy.resize(data, (int(data.size / 3), 3)) mesh_builder.setVertices(vertices) mesh_builder.calculateNormals(fast=True) + if file_name: + # The filename is used to give the user the option to reload the file if it is changed on disk + # It is only set for the root node of the 3mf file + mesh_builder.setFileName(file_name) mesh_data = mesh_builder.build() if len(mesh_data.getVertices()): @@ -171,7 +175,7 @@ class ThreeMFReader(MeshReader): scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read()) self._unit = scene_3mf.getUnit() for node in scene_3mf.getSceneNodes(): - um_node = self._convertSavitarNodeToUMNode(node) + um_node = self._convertSavitarNodeToUMNode(node, file_name) if um_node is None: continue # compensate for original center position, if object(s) is/are not around its zero position diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json new file mode 100644 index 0000000000..e39cbba126 --- /dev/null +++ b/resources/definitions/dxu.def.json @@ -0,0 +1,182 @@ +{ + "version": 2, + "name": "DXU", + "inherits": "ultimaker2_plus", + "metadata": { + "visible": true, + "author": "TheUltimakerCommunity", + "manufacturer": "DXU", + "category": "Other", + "has_variants": true, + "has_materials": true, + "has_machine_materials": false, + "has_machine_quality": false, + "has_variant_materials": false, + "weight": 0, + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker.png", + "platform": "ultimaker2_platform.obj", + "platform_texture": "dxu_backplate.png", + "platform_offset": [1.5, 0, 0], + "machine_extruder_trains": + { + "0": "dxu_extruder1", + "1": "dxu_extruder2" + }, + "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"] + }, + "overrides": { + "machine_name": { + "default_value": "dxu" + }, + "machine_width": { + "default_value": 238 + }, + "machine_depth": { + "default_value": 223 + }, + "machine_height": { + "default_value": 203 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 1.5 + }, + "machine_min_cool_heat_time_window": + { + "default_value": 15.0 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_nozzle_head_distance": { + "default_value": 5 + }, + "machine_nozzle_expansion_angle": { + "default_value": 45 + }, + "machine_heat_zone_length": { + "default_value": 20 + }, + "machine_heated_bed": { + "default_value": true + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "layer_height_0": { + "value": "round(machine_nozzle_size / 1.5, 2)" + }, + "line_width": { + "value": "round(machine_nozzle_size * 0.875, 2)" + }, + "speed_support": { + "value": "speed_wall_0" + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 40 + }, + "machine_max_feedrate_e": { + "default_value": 45 + }, + "machine_acceleration": { + "default_value": 3000 + }, + "retraction_amount": { + "default_value": 6.5 + }, + "retraction_speed": { + "default_value": 25 + }, + "switch_extruder_retraction_amount": { + "value": "retraction_amount", + "enabled": false + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed", + "enabled": false + }, + "switch_extruder_retraction_speed": { + "value": "retraction_retract_speed", + "enabled": false + }, + "switch_extruder_prime_speed": { + "value": "retraction_prime_speed", + "enabled": false + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -44, 14 ], + [ -44, -34 ], + [ 64, 14 ], + [ 64, -34 ] + ] + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode" : { + "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y20 F7200\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\"" + }, + "machine_end_gcode" : { + "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": { + "default_value": 2 + }, + "extruder_prime_pos_abs": { "default_value": false }, + "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false }, + "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false }, + "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false }, + "layer_start_x": { + "default_value": 180.0, + "enabled": false + }, + "layer_start_y": { + "default_value": 160.0, + "enabled": false + }, + "prime_tower_position_x": { + "value": "180" + }, + "prime_tower_position_y": { + "value": "160" + }, + "material_adhesion_tendency": { + "enabled": true + }, + "machine_disallowed_areas": { + "default_value": [ + [[-120, 112.5], [ -101, 112.5], [ -101, 106.5], [-120, 106.5]], + [[ 120, 112.5], [ 120, 106.5], [ 86, 106.5], [ 86, 112.5]], + [[-120, -112.5], [-120, -106.5], [ -101, -106.5], [ -101, -112.5]], + [[ 120, -112.5], [ 86, -112.5], [ 86, -106.5], [ 120, -106.5]], + [[ 120, -112.5], [ 120, -72.5], [ 93, -72.5], [ 93, -112.5]] + ] + } + } +} diff --git a/resources/definitions/dxu_dual.def.json b/resources/definitions/dxu_dual.def.json new file mode 100644 index 0000000000..ebd126c142 --- /dev/null +++ b/resources/definitions/dxu_dual.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "DXU Dual", + "inherits": "dxu", + "overrides": { + "machine_start_gcode" : { + "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;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 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" + }, + "machine_end_gcode" : { + "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\"" + }, + "prime_tower_enable": { + "default_value": true + } + } +} diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index ba90894f7d..d0c7b3ca31 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -1,44 +1,33 @@ { - "name": "Rigid3D", + "name": "Rigid3D 2. Nesil", "version": 2, - "inherits": "fdmprinter", + "inherits": "rigid3d_base", "metadata": { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Rigid3D", - "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "rigid3d_extruder_0" - } - }, + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard" + }, "overrides": { - "machine_start_gcode": { - "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" - }, - "machine_end_gcode": { - "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" - }, - "machine_head_with_fans_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] }, - "skirt_gap": { "default_value": 5.0 }, - "cool_min_layer_time": { "default_value": 10 }, - "prime_tower_size": { "default_value": 7.745966692414834 }, - "layer_height_0": { "default_value": 0.25 }, - "support_angle": { "default_value": 45 }, - "retraction_speed": { "default_value": 60.0 }, - "wall_thickness": { "default_value": 0.8 }, - "retraction_amount": { "default_value": 1 }, - "layer_height": { "default_value": 0.25 }, - "speed_print": { "default_value": 40 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 210 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "Rigid3D 2. Nesil" }, + + "machine_heated_bed": { "default_value": true }, + + "machine_width": { "default_value": 250 }, "machine_depth": { "default_value": 250 }, - "machine_width": { "default_value": 250 }, - "machine_name": { "default_value": "Rigid3D" } + "machine_height": { "default_value": 210 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n"}, + "machine_end_gcode": {"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -22, -67], [ -22, 51], [ 36, -67], [ 36, 51] + ] + }, + + "gantry_height": { "value": 20 } } } diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index 6e1a93fb40..7fd69164c3 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -1,43 +1,33 @@ { - "name": "Rigid3D 3rdGen", + "name": "Rigid3D 3. Nesil", "version": 2, - "inherits": "fdmprinter", + "inherits": "rigid3d_base", "metadata": { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Rigid3D", - "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "rigid3d_3rdgen_extruder_0" - } - }, + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard" + }, "overrides": { - "machine_start_gcode": { - "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" - }, - "machine_end_gcode": { - "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" - }, - "machine_head_with_fans_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] }, - "cool_min_layer_time": { "default_value": 10 }, - "prime_tower_size": { "default_value": 7.745966692414834 }, - "skirt_gap": { "default_value": 5.0 }, - "layer_height_0": { "default_value": 0.25 }, - "support_angle": { "default_value": 45 }, - "retraction_speed": { "default_value": 60.0 }, - "wall_thickness": { "default_value": 0.8 }, - "retraction_amount": { "default_value": 1 }, - "layer_height": { "default_value": 0.25 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 240 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "Rigid3D 3. Nesil" }, + + "machine_heated_bed": { "default_value": true }, + + "machine_width": { "default_value": 270 }, "machine_depth": { "default_value": 290 }, - "machine_width": { "default_value": 275 }, - "machine_name": { "default_value": "Rigid3D 3rd Geneartion" } + "machine_height": { "default_value": 240 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n"}, + "machine_end_gcode": {"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -18, -20], [ -18, 45], [ 32, -20], [ 32, 45] + ] + }, + + "gantry_height": { "value": 20 } } } diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json new file mode 100644 index 0000000000..76f2ec54f8 --- /dev/null +++ b/resources/definitions/rigid3d_base.def.json @@ -0,0 +1,274 @@ +{ + "name": "Rigid3D Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Ramazan UTKU", + "manufacturer": "Rigid3D", + "file_formats": "text/x-gcode", + "has_materials": true, + "has_machine_quality": true, + + "machine_extruder_trains":{ + "0": "rigid3d_base_extruder_0" + }, + "first_start_actions": ["MachineSettingsAction"], + "supported_actions": ["MachineSettingsAction"], + + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_tough_pla", + "generic_tpu", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { "default_value": "Rigid3D Base Printer" }, + + "material_diameter": { "default_value": 1.75 }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 500 }, + "machine_max_feedrate_e": { "value": 500 }, + + "machine_max_acceleration_x": { "value": 600 }, + "machine_max_acceleration_y": { "value": 600 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 600 }, + "machine_acceleration": { "value": 600 }, + + "machine_max_jerk_xy": { "value": 10.0 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 5 }, + + "acceleration_print": { "value": 600 }, + + "acceleration_travel": { "value": 600 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 40.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_print" }, + "speed_wall_x": { "value": "speed_print" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "80.0" }, + "speed_layer_0": { "value": 15.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "speed_travel" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + + "z_seam_type": { "value": "'shortest'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + + "infill_sparse_density": { "value": "15" }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "value":30, + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "value":"retraction_speed", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "value":"retraction_speed / 2", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_amount" : { "default_value": 1.0}, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": false }, + + "small_hole_max_size": { "value": 4.0 }, + + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 5 }, + "retraction_extrusion_window": { "value": "retraction_amount" }, + "retraction_min_travel": { "value": 0.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'skirt'" }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 2 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_tree_enable else 20" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 70 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 5 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" }, + + "layer_height_0": {"value": 0.2} + + } +}
\ No newline at end of file diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index d89c1aeaff..9e62173f1e 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -1,40 +1,159 @@ { "name": "Rigid3D Hobby", "version": 2, - "inherits": "fdmprinter", + "inherits": "rigid3d_base", "metadata": { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Rigid3D", - "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "rigid3d_hobby_extruder_0" - } - }, + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_abs_175", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_175", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_hips_175", + "generic_nylon", + "generic_nylon_175", + "generic_pc", + "generic_pc_175", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, "overrides": { - "machine_head_with_fans_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] }, - "prime_tower_size": { "default_value": 8.660254037844387 }, - "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 }, - "skirt_line_count": { "default_value": 2 }, - "support_angle": { "default_value": 45 }, - "retraction_speed": { "default_value": 80 }, - "wall_thickness": { "default_value": 0.8 }, - "retraction_amount": { "default_value": 2 }, - "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 30 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": false }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 150 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "Rigid3D Hobby" }, + + "machine_heated_bed": { "default_value": false }, + + "machine_width": { "default_value": 150 }, "machine_depth": { "default_value": 150 }, - "machine_width": { "default_value": 150 }, - "machine_name": { "default_value": "Rigid3D Hobby" } + "machine_height": { "default_value": 150 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"}, + "machine_end_gcode": {"default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -16, -30], [ -16, 45], [ 16, -30], [ 16, 45] + ] + }, + + "gantry_height": { "value": 20 } } } diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index 75853fab8b..3d075b062f 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -1,142 +1,161 @@ { "name": "Rigid3D Mucit", "version": 2, - "inherits": "fdmprinter", + "inherits": "rigid3d_base", "metadata": { - "visible": true, - "author": "Rigid3D", - "manufacturer": "Rigid3D", - "has_materials": false, - "file_formats": "text/x-gcode", - "platform": "rigid3d_mucit_platform.stl", + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard", + "platform": "rigid3d_mucit_platform.stl", "platform_offset": [ 0, -19, 0], - "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "rigid3d_mucit_extruder_0" - } + + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_abs_175", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_175", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_hips_175", + "generic_nylon", + "generic_nylon_175", + "generic_pc", + "generic_pc_175", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] }, "overrides": { "machine_name": { "default_value": "Rigid3D Mucit" }, - "z_seam_type": { - "default_value": "random" - }, - "machine_heated_bed": { - "default_value": false - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "default_value": 0.8 - }, - "top_bottom_thickness": { - "default_value": 0.8 - }, - "xy_offset": { - "default_value": -0.2 - }, - "material_print_temperature": { - "value": "205" - }, - "speed_print": { - "default_value": 40 - }, - "speed_layer_0": { - "value": "15" - }, - "speed_travel": { - "value": "100" - }, - "support_enable": { - "default_value": false - }, - "infill_sparse_density": { - "default_value": 15 - }, - "infill_pattern": { - "value": "'lines'" - }, - "retraction_amount": { - "default_value": 1 - }, - "machine_width": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_gcode_flavor": { - "default_value": "RepRap" - }, - "cool_fan_enabled": { - "default_value": true - }, - "cool_fan_speed": { - "value": "100" - }, - "cool_fan_full_at_height": { - "value": "0.5" - }, - "support_z_distance": { - "default_value": 0.2 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_density": { - "default_value": 70 - }, - "support_interface_pattern": { - "default_value": "grid" - }, - "fill_outline_gaps": { - "default_value": true - }, - "ironing_enabled": { - "default_value": true - }, - "ironing_only_highest_layer": { - "default_value": true - }, - "material_initial_print_temperature": { - "value": "205" - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "retraction_speed": { - "value": "40" - }, - "roofing_layer_count": { - "value": "1" - }, - "speed_equalize_flow_enabled": { - "default_value": true - }, - "speed_topbottom": { - "value": "40" - }, - "speed_travel_layer_0": { - "value": "15" - }, - "speed_wall_0": { - "value": "30" - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_start_gcode": { - "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n" - }, - "machine_end_gcode": { - "default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" - } + + "machine_heated_bed": { "default_value": false }, + + "machine_width": { "default_value": 150 }, + "machine_depth": { "default_value": 150 }, + "machine_height": { "default_value": 150 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"}, + "machine_end_gcode": {"default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -20, 102], [ -20, -45], [ 45, -45], [ 45, 102] + ] + }, + + "gantry_height": { "value": 20 } } } diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 54bd2c3dca..678f4bc80c 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -1,44 +1,159 @@ { "name": "Rigid3D Zero", "version": 2, - "inherits": "fdmprinter", + "inherits": "rigid3d_base", "metadata": { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Rigid3D", - "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "rigid3d_zero_extruder_0" - } - }, + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs", + "generic_abs_175", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_175", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_hips_175", + "generic_nylon", + "generic_nylon_175", + "generic_pc", + "generic_pc_175", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pp", + "generic_pva", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, "overrides": { - "machine_start_gcode": { - "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" - }, - "machine_end_gcode": { - "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" - }, - "machine_head_with_fans_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] }, - "support_pattern": { "default_value": "grid" }, - "cool_min_layer_time": { "default_value": 10 }, - "support_angle": { "default_value": 45 }, - "prime_tower_size": { "default_value": 7.745966692414834 }, - "skirt_line_count": { "default_value": 2 }, - "layer_height_0": { "default_value": 0.25 }, - "wall_thickness": { "default_value": 0.8 }, - "retraction_amount": { "default_value": 1.5 }, - "skirt_gap": { "default_value": 5.0 }, - "layer_height": { "default_value": 0.25 }, - "speed_print": { "default_value": 30 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 190 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "Rigid3D Zero" }, + + "machine_heated_bed": { "default_value": false }, + + "machine_width": { "default_value": 250 }, "machine_depth": { "default_value": 250 }, - "machine_width": { "default_value": 250 }, - "machine_name": { "default_value": "Rigid3D Zero" } + "machine_height": { "default_value": 190 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n"}, + "machine_end_gcode": {"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -40, -15], [ -40, 60], [ 30, -15], [ 30, 60] + ] + }, + + "gantry_height": { "value": 20 } } } diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index cc922769f7..c6b7c980e7 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -1,117 +1,34 @@ { "name": "Rigid3D Zero2", "version": 2, - "inherits": "fdmprinter", + "inherits": "rigid3d_base", "metadata": { - "visible": true, - "author": "Rigid3D", - "manufacturer": "Rigid3D", - "has_materials": false, - "file_formats": "text/x-gcode", - "platform": "rigid3d_zero2_platform.stl", - "platform_offset": [ 5, 0, -35], - "machine_extruder_trains": - { - "0": "rigid3d_zero2_extruder_0" - } + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard", + + "platform": "rigid3d_zero2_platform.stl" }, "overrides": { "machine_name": { "default_value": "Rigid3D Zero2" }, - "machine_head_with_fans_polygon": { - "default_value": [[ 30, 30], [ 30, 70], [ 30, 70], [ 30, 30]] - }, - "z_seam_type": { - "default_value": "random" - }, - "machine_heated_bed": { - "default_value": true - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "default_value": 0.8 - }, - "top_bottom_thickness": { - "default_value": 0.8 - }, - "xy_offset": { - "default_value": -0.2 - }, - "material_print_temperature": { - "value": 235 - }, - "speed_print": { - "default_value": 40 - }, - "speed_layer_0": { - "value": 15 - }, - "speed_travel": { - "value": 100 - }, - "support_enable": { - "default_value": false - }, - "infill_sparse_density": { - "default_value": 15 - }, - "infill_pattern": { - "value": "'lines'" - }, - "retraction_amount": { - "default_value": 1 - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "25" - }, - "machine_gcode_flavor": { - "default_value": "RepRap" - }, - "cool_fan_enabled": { - "default_value": false - }, - "cool_fan_speed": { - "value": 50 - }, - "cool_fan_full_at_height": { - "value": 1.0 - }, - "support_z_distance": { - "default_value": 0.2 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_density": { - "default_value": 70 - }, - "support_interface_pattern": { - "default_value": "grid" - }, - "machine_start_gcode": { - "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG1 Z-5 F180;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n" - }, - "machine_end_gcode": { - "default_value": "G1 X0 Y180 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off\n" - } + + "machine_heated_bed": { "default_value": true }, + + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 192 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": "; -- START GCODE --\nG21 ; mm olculer\nG28 ; Eksenleri sifirla\nM420 S1 ; Yazilim destekli tabla seviyeleme\nM107 ; Fani kapat\nG90 ; Mutlak konumlama\nG1 Z5 F180 ; Z eksenini 5mm yukselt\nG1 X30 Y30 F3000 ; Konuma git\nM82 ; Ekstruder mutlak mod\nG92 E0 ; Ekstruder konumu sifirla\n; -- end of START GCODE --"}, + "machine_end_gcode": {"default_value": "; -- END GCODE --\nG1 X0 Y180 ; Konuma git\nM107 ; Fani kapat\nG91 ; Goreceli konumlama\nG0 Z20 ; Tablayi alcalt\nT0\nG1 E-2 ; Filaman basincini dusur\nM104 T0 S0 ; Ekstruder isiticiyi kapat\nG90 ; Mutlak konumlama\nG92 E0 ; Ekstruder konumu sifirla\nM140 S0 ; Tabla isiticiyi kapat\nM84 ; Motorlari durdur\nM300 S2093 P150 ; Baski sonu melodisi\nM300 S2637 P150\nM300 S3135 P150\nM300 S4186 P150\nM300 S3135 P150\nM300 S2637 P150\nM300 S2793 P150\nM300 S2349 P150\nM300 S1975 P150\nM300 S2093 P450\n; -- end of END GCODE --\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -30, 65], [ -30, -30], [ 30, -30], [ 30, 65] + ] + }, + + "gantry_height": { "value": 25 } } } diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json new file mode 100644 index 0000000000..0a01881441 --- /dev/null +++ b/resources/extruders/dxu_extruder1.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "dxu", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 } + } +} diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json new file mode 100644 index 0000000000..5e730c49f4 --- /dev/null +++ b/resources/extruders/dxu_extruder2.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "dxu", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 19.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 } + } +} diff --git a/resources/extruders/rigid3d_3rdgen_extruder_0.def.json b/resources/extruders/rigid3d_3rdgen_extruder_0.def.json deleted file mode 100644 index edc87f695e..0000000000 --- a/resources/extruders/rigid3d_3rdgen_extruder_0.def.json +++ /dev/null @@ -1,15 +0,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_zero_extruder_0.def.json b/resources/extruders/rigid3d_base_extruder_0.def.json index 76a8fceaae..c4d34c304f 100644 --- a/resources/extruders/rigid3d_zero_extruder_0.def.json +++ b/resources/extruders/rigid3d_base_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "rigid3d_zero", + "machine": "rigid3d_base", "position": "0" }, diff --git a/resources/extruders/rigid3d_extruder_0.def.json b/resources/extruders/rigid3d_extruder_0.def.json deleted file mode 100644 index eaac6b16a0..0000000000 --- a/resources/extruders/rigid3d_extruder_0.def.json +++ /dev/null @@ -1,15 +0,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 deleted file mode 100644 index 68dd523af3..0000000000 --- a/resources/extruders/rigid3d_hobby_extruder_0.def.json +++ /dev/null @@ -1,15 +0,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 deleted file mode 100644 index de72db7a33..0000000000 --- a/resources/extruders/rigid3d_mucit_extruder_0.def.json +++ /dev/null @@ -1,15 +0,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 deleted file mode 100644 index 051ce2384d..0000000000 --- a/resources/extruders/rigid3d_zero2_extruder_0.def.json +++ /dev/null @@ -1,15 +0,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/images/dxu_backplate.png b/resources/images/dxu_backplate.png Binary files differnew file mode 100644 index 0000000000..cb58733a11 --- /dev/null +++ b/resources/images/dxu_backplate.png diff --git a/resources/meshes/rigid3d_zero2_platform.stl b/resources/meshes/rigid3d_zero2_platform.stl Binary files differindex ef81aaf9ec..178b21a32b 100644 --- a/resources/meshes/rigid3d_zero2_platform.stl +++ b/resources/meshes/rigid3d_zero2_platform.stl diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index 5ab0217f01..c73aa3958e 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -159,6 +159,7 @@ Item enabled: !addPrinterByIpScreen.hasRequestInProgress && !addPrinterByIpScreen.isPrinterDiscovered && (hostnameField.state != "invalid" && hostnameField.text != "") onClicked: { + addPrinterByIpScreen.hasRequestFinished = false //In case it's pressed multiple times. const address = hostnameField.text if (!networkingUtil.isValidIP(address)) { @@ -197,17 +198,21 @@ Item renderType: Text.NativeRendering visible: addPrinterByIpScreen.hasRequestInProgress || (addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.isPrinterDiscovered) + textFormat: Text.RichText text: { if (addPrinterByIpScreen.hasRequestFinished) { - catalog.i18nc("@label", "Could not connect to device.") + return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">" + + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>"; } else { - catalog.i18nc("@label", "The printer at this address has not responded yet.") + return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/en/resources/52891-set-up-a-cloud-connection\">" + + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>"; } } + onLinkActivated: Qt.openUrlExternally(link) } Item diff --git a/resources/quality/creality/base/base_global_standard.inst.cfg b/resources/quality/creality/base/base_global_standard.inst.cfg index bd60933d28..1257466b1c 100644 --- a/resources/quality/creality/base/base_global_standard.inst.cfg +++ b/resources/quality/creality/base/base_global_standard.inst.cfg @@ -14,5 +14,5 @@ global_quality = True layer_height = 0.2 layer_height_0 = 0.2 top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*5 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg new file mode 100644 index 0000000000..de5c97f913 --- /dev/null +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_abs + +[values] +cool_fan_enabled = False +default_material_print_temperature = 240 +default_material_bed_temperature = 100 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg new file mode 100644 index 0000000000..9a49399734 --- /dev/null +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Good Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = good +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_enabled = False +default_material_print_temperature = 235 +default_material_bed_temperature = 100
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg new file mode 100644 index 0000000000..2515cc32eb --- /dev/null +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_enabled = False +default_material_print_temperature = 240 +default_material_bed_temperature = 100 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg new file mode 100644 index 0000000000..9b140cbb75 --- /dev/null +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_abs + +[values] +cool_fan_enabled = False +default_material_print_temperature = 235 +default_material_bed_temperature = 100 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg new file mode 100644 index 0000000000..55dd8755fb --- /dev/null +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_abs + +[values] +cool_fan_enabled = False +default_material_print_temperature = 235 +default_material_bed_temperature = 100 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg new file mode 100644 index 0000000000..748b4d6c50 --- /dev/null +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Ultra Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_abs + +[values] +cool_fan_enabled = False +default_material_print_temperature = 235 +default_material_bed_temperature = 100 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg new file mode 100644 index 0000000000..cd2e5804cd --- /dev/null +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Dynamic Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_nylon + +[values] +default_material_print_temperature = 250 +default_material_bed_temperature = 90 +retraction_amount = 3 +cool_fan_enabled = False +retraction_speed = 40
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg new file mode 100644 index 0000000000..11ecdbf8d7 --- /dev/null +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Good Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = good +material = generic_nylon + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 90 +retraction_amount = 3 +cool_fan_enabled = False +retraction_speed = 40
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg new file mode 100644 index 0000000000..d512935d05 --- /dev/null +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Low Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_nylon + +[values] +default_material_print_temperature = 250 +default_material_bed_temperature = 90 +retraction_amount = 3 +cool_fan_enabled = False +retraction_speed = 40
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg new file mode 100644 index 0000000000..e936714f2c --- /dev/null +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_nylon + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 90 +retraction_amount = 3 +cool_fan_enabled = False +retraction_speed = 40
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg new file mode 100644 index 0000000000..b634af5a7f --- /dev/null +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Super Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_nylon + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 90 +retraction_amount = 3 +cool_fan_enabled = False +retraction_speed = 40
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg new file mode 100644 index 0000000000..583d8660f8 --- /dev/null +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Ultra Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_nylon + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 90 +retraction_amount = 3 +cool_fan_enabled = False +retraction_speed = 40 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg new file mode 100644 index 0000000000..ae8de691b7 --- /dev/null +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_petg + +[values] +retraction_amount = 2 +default_material_print_temperature = 250 +default_material_bed_temperature = 85 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg new file mode 100644 index 0000000000..7a97e15b90 --- /dev/null +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Good Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = good +material = generic_petg + +[values] +retraction_amount = 2 +default_material_print_temperature = 245 +default_material_bed_temperature = 85 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg new file mode 100644 index 0000000000..c3153454b8 --- /dev/null +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_petg + +[values] +retraction_amount = 2 +default_material_print_temperature = 250 +default_material_bed_temperature = 85 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg new file mode 100644 index 0000000000..d583ab6514 --- /dev/null +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_petg + +[values] +retraction_amount = 2 +default_material_print_temperature = 245 +default_material_bed_temperature = 85 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg new file mode 100644 index 0000000000..cb77ab35d8 --- /dev/null +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_petg + +[values] +retraction_amount = 2 +default_material_print_temperature = 245 +default_material_bed_temperature = 85 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg new file mode 100644 index 0000000000..6ab237d97b --- /dev/null +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Ultra Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_petg + +[values] +retraction_amount = 2 +default_material_print_temperature = 245 +default_material_bed_temperature = 85 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg new file mode 100644 index 0000000000..67ece9b983 --- /dev/null +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_pla + +[values] +default_material_print_temperature = 210 +default_material_bed_temperature = 55 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg new file mode 100644 index 0000000000..ebc48e1e47 --- /dev/null +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Good Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = good +material = generic_pla + +[values] +default_material_print_temperature = 205 +default_material_bed_temperature = 55 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg new file mode 100644 index 0000000000..a2cc3d8ada --- /dev/null +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_pla + +[values] +default_material_print_temperature = 210 +default_material_bed_temperature = 55 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg new file mode 100644 index 0000000000..6f30e132f4 --- /dev/null +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_pla + +[values] +default_material_print_temperature = 205 +default_material_bed_temperature = 55 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg new file mode 100644 index 0000000000..075aaa18e4 --- /dev/null +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_pla + +[values] +default_material_print_temperature = 205 +default_material_bed_temperature = 55 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg new file mode 100644 index 0000000000..7460b92cb3 --- /dev/null +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_pla + +[values] +default_material_print_temperature = 205 +default_material_bed_temperature = 55 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg new file mode 100644 index 0000000000..2ca4e97ba9 --- /dev/null +++ b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +weight = -6 +global_quality = True + +[values] +layer_height = 0.24 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 +adaptive_layer_height_enabled = true diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg new file mode 100644 index 0000000000..1e5da51f73 --- /dev/null +++ b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Good Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = good +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*5 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg new file mode 100644 index 0000000000..f93f3c83df --- /dev/null +++ b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*3 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg new file mode 100644 index 0000000000..0fce643397 --- /dev/null +++ b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg new file mode 100644 index 0000000000..5ff420ea23 --- /dev/null +++ b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*7 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg new file mode 100644 index 0000000000..6f96648312 --- /dev/null +++ b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.06 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg new file mode 100644 index 0000000000..bc93daa751 --- /dev/null +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Dynamic Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = adaptive +material = generic_tpu + +[values] +default_material_print_temperature = 250 +default_material_bed_temperature = 70 +speed_print = 20 +retraction_speed = 20 +retraction_amount = 3
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg new file mode 100644 index 0000000000..0f0b3fad82 --- /dev/null +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Good Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = good +material = generic_tpu + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 70 +speed_print = 20 +retraction_speed = 20 +retraction_amount = 3
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg new file mode 100644 index 0000000000..c0653ede27 --- /dev/null +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Low Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = low +material = generic_tpu + +[values] +default_material_print_temperature = 250 +default_material_bed_temperature = 70 +speed_print = 20 +retraction_speed = 20 +retraction_amount = 3
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg new file mode 100644 index 0000000000..a0aa088d5b --- /dev/null +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Standard Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = standard +material = generic_tpu + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 70 +speed_print = 20 +retraction_speed = 20 +retraction_amount = 3
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg new file mode 100644 index 0000000000..23a6e77aca --- /dev/null +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Super Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = super +material = generic_tpu + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 70 +speed_print = 20 +retraction_speed = 20 +retraction_amount = 3
\ No newline at end of file diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg new file mode 100644 index 0000000000..206a8c7c01 --- /dev/null +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Ultra Quality +definition = rigid3d_base + +[metadata] +setting_version = 9 +type = quality +quality_type = ultra +material = generic_tpu + +[values] +default_material_print_temperature = 245 +default_material_bed_temperature = 70 +speed_print = 20 +retraction_speed = 20 +retraction_amount = 3
\ No newline at end of file diff --git a/resources/variants/dxu_0.25.inst.cfg b/resources/variants/dxu_0.25.inst.cfg new file mode 100644 index 0000000000..e1a89a7ba7 --- /dev/null +++ b/resources/variants/dxu_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.25 mm +version = 4 +definition = dxu + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 +machine_nozzle_tip_outer_diameter = 0.8
\ No newline at end of file diff --git a/resources/variants/dxu_0.4.inst.cfg b/resources/variants/dxu_0.4.inst.cfg new file mode 100644 index 0000000000..efadcae8ec --- /dev/null +++ b/resources/variants/dxu_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm +version = 4 +definition = dxu + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.05
\ No newline at end of file diff --git a/resources/variants/dxu_0.6.inst.cfg b/resources/variants/dxu_0.6.inst.cfg new file mode 100644 index 0000000000..fe9bb231be --- /dev/null +++ b/resources/variants/dxu_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm +version = 4 +definition = dxu + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +machine_nozzle_tip_outer_diameter = 1.25
\ No newline at end of file diff --git a/resources/variants/dxu_0.8.inst.cfg b/resources/variants/dxu_0.8.inst.cfg new file mode 100644 index 0000000000..58a659fb11 --- /dev/null +++ b/resources/variants/dxu_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm +version = 4 +definition = dxu + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 1.35
\ No newline at end of file diff --git a/resources/variants/dxu_dual_0.25.inst.cfg b/resources/variants/dxu_dual_0.25.inst.cfg new file mode 100644 index 0000000000..2be684ff1c --- /dev/null +++ b/resources/variants/dxu_dual_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.25 mm +version = 4 +definition = dxu_dual + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 +machine_nozzle_tip_outer_diameter = 0.8
\ No newline at end of file diff --git a/resources/variants/dxu_dual_0.4.inst.cfg b/resources/variants/dxu_dual_0.4.inst.cfg new file mode 100644 index 0000000000..d543f083e0 --- /dev/null +++ b/resources/variants/dxu_dual_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm +version = 4 +definition = dxu_dual + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.05
\ No newline at end of file diff --git a/resources/variants/dxu_dual_0.6.inst.cfg b/resources/variants/dxu_dual_0.6.inst.cfg new file mode 100644 index 0000000000..fdd60c9221 --- /dev/null +++ b/resources/variants/dxu_dual_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm +version = 4 +definition = dxu_dual + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +machine_nozzle_tip_outer_diameter = 1.25
\ No newline at end of file diff --git a/resources/variants/dxu_dual_0.8.inst.cfg b/resources/variants/dxu_dual_0.8.inst.cfg new file mode 100644 index 0000000000..be6cdb3649 --- /dev/null +++ b/resources/variants/dxu_dual_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm +version = 4 +definition = dxu_dual + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 1.35
\ No newline at end of file diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 400e4d092c..d27c78425b 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -70,7 +70,7 @@ speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_angle = 60 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.4 support_interface_enable = True diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 01d465fe6a..e6706ecc6f 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -37,7 +37,7 @@ speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.2 support_interface_enable = True diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 4a3f3e371f..87ca9ba34d 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -70,7 +70,7 @@ speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_angle = 60 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.4 support_interface_enable = True diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index a8d706d2e4..9a3dbe8455 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -37,7 +37,7 @@ speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.2 support_interface_enable = True diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 5c1e9c449e..b234a132fa 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -70,7 +70,7 @@ speed_prime_tower = =math.ceil(speed_print * 7 / 35) support_angle = 60 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.4 support_interface_enable = True diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 7c37ffaa76..384b7d3d62 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -37,7 +37,7 @@ speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.2 support_interface_enable = True diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index f393da7ff3..400d74752c 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -70,7 +70,7 @@ speed_prime_tower = =math.ceil(speed_print * 7 / 35) support_angle = 60 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.4 support_interface_enable = True diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 7b3634a923..6a503177af 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -37,7 +37,7 @@ speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag -support_bottom_stair_step_height = =layer_height +support_bottom_stair_step_height = 0 support_infill_rate = 50 support_infill_sparse_thickness = 0.2 support_interface_enable = True |
