diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index 4e17fe9f84d..90f6feb3ac7 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Trimaker Nebula", + "name": "trimaker_nebula", "inherits": "fdmprinter", "metadata": { @@ -52,7 +52,7 @@ "layer_height": { "default_value": 0.2 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 230 }, - "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, + "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X200 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 260 }, "machine_name": { "default_value": "Trimaker Nebula" }, @@ -75,7 +75,6 @@ "support_z_distance": { "default_value": 0.17 }, "top_bottom_thickness": { "value": "layer_height * 6" }, "wall_thickness": { "value": "line_width * 3" }, - "xy_offset": { "default_value": 0 }, "xy_offset_layer_0": { "value": -0.1 } } -} \ No newline at end of file +} diff --git a/resources/definitions/trimaker_nebula_cloud.def.json b/resources/definitions/trimaker_nebula_cloud.def.json new file mode 100644 index 00000000000..77724d8e4c5 --- /dev/null +++ b/resources/definitions/trimaker_nebula_cloud.def.json @@ -0,0 +1,71 @@ +{ + "version": 2, + "name": "trimaker_nebula_cloud", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Trimaker", + "manufacturer": "Trimaker", + "file_formats": "text/x-gcode", + "platform": "trimaker_nebula_platform.stl", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "trimaker_nebula_cloud_extruder" }, + "platform_offset": [ + -117.5, + -40, + 147.5 + ], + "preferred_material": "redd_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_enable" : { "value": false }, + "adhesion_type": { "default_value": "skirt" }, + "default_material_print_temperature": { "default_value": 200 }, + "gantry_height": { "value": 2 }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'gyroid'" }, + "infill_sparse_density": { "default_value": 15 }, + "infill_wipe_dist": { "value": "0" }, + "layer_height": { "default_value": 0.2 }, + "line_width": { "value": "machine_nozzle_size * 0.875" }, + "machine_acceleration": { "default_value": 1500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 230 }, + "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X200 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_name": { "default_value": "Trimaker Nebula" }, + "machine_start_gcode": { "default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0};\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n" }, + "machine_width": { "default_value": 230 }, + "material_diameter": { "default_value": 1.75 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "default_value": 1 }, + "retraction_speed": { "default_value": 35 }, + "retraction_extra_prime_amount": { "default_value": 0.02}, + "skin_monotonic": { "value": true }, + "skin_overlap": { "value": "10" }, + "speed_layer_0": { "value": 20 }, + "speed_print": { "default_value": 45 }, + "speed_infill": { "maximum_value_warning": 250 }, + "speed_travel": { "value": "speed_print if magic_spiralize else 100" }, + "speed_wall_0": { "value": 35 }, + "speed_wall_x": { "value": 45 }, + "support_enable": { "default_value": true }, + "support_pattern": { "default_value": "gyroid" }, + "support_z_distance": { "default_value": 0.17 }, + "top_bottom_thickness": { "value": "layer_height * 6" }, + "wall_thickness": { "value": "line_width * 3" }, + "xy_offset_layer_0": { "value": -0.1 } + } +} diff --git a/resources/definitions/trimaker_nebula_plus.def.json b/resources/definitions/trimaker_nebula_plus.def.json index 906ef4cb86b..d14b099306d 100644 --- a/resources/definitions/trimaker_nebula_plus.def.json +++ b/resources/definitions/trimaker_nebula_plus.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Trimaker Nebula Plus", + "name": "trimaker_nebula_plus", "inherits": "fdmprinter", "metadata": { @@ -11,7 +11,7 @@ "platform": "trimaker_nebula_platform.stl", "has_machine_quality": true, "has_materials": true, - "machine_extruder_trains": { "0": "trimaker_nebula_extruder" }, + "machine_extruder_trains": { "0": "trimaker_nebula_plus_extruder" }, "platform_offset": [ -117.5, -40, @@ -86,7 +86,7 @@ "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 230 }, - "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, + "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X200 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, "machine_extruder_count": { "default_value": 1 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": true }, @@ -118,7 +118,5 @@ "support_z_distance": { "default_value": 0.17 }, "top_bottom_thickness": { "value": "layer_height * 6" }, "wall_thickness": { "value": "line_width * 3" }, - "xy_offset": { "default_value": 0 }, - "xy_offset_layer_0": { "value": -0.1 } } -} \ No newline at end of file +} diff --git a/resources/extruders/trimaker_nebula_cloud_extruder.def.json b/resources/extruders/trimaker_nebula_cloud_extruder.def.json new file mode 100644 index 00000000000..f03a7775166 --- /dev/null +++ b/resources/extruders/trimaker_nebula_cloud_extruder.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "trimaker_nebula_cloud", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/trimaker_nebula_plus_extruder.def.json b/resources/extruders/trimaker_nebula_plus_extruder.def.json new file mode 100644 index 00000000000..6b479bfe3f8 --- /dev/null +++ b/resources/extruders/trimaker_nebula_plus_extruder.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "trimaker_nebula_plus", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_fast.inst.cfg b/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_fast.inst.cfg new file mode 100644 index 00000000000..9cebfa89317 --- /dev/null +++ b/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_fast.inst.cfg @@ -0,0 +1,25 @@ +[general] +definition = trimaker_nebula_cloud +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 22 +type = quality +weight = 1 + +[values] +layer_height = 0.2 +speed_layer_0 = 20 +speed_infill = 175 +speed_travel = 100 +speed_wall = 90 +speed_wall_0 = 75 +speed_wall_x =90 +speed_topbottom = 125 +speed_support = 100 +speed_print = 150 +default_material_print_temperature = 225 + diff --git a/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_normal.inst.cfg b/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_normal.inst.cfg new file mode 100644 index 00000000000..19b07e2cd35 --- /dev/null +++ b/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_normal.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = trimaker_nebula_cloud +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 22 +type = quality +weight = 0 + +[values] +layer_height = 0.2 +speed_print = 45 + diff --git a/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_slow.inst.cfg b/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_slow.inst.cfg new file mode 100644 index 00000000000..3b2ed542428 --- /dev/null +++ b/resources/quality/trimaker_nebula_cloud/trimaker_nebula_cloud_slow.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = trimaker_nebula_cloud +name = Slow +version = 4 + +[metadata] +global_quality = True +quality_type = slow +setting_version = 22 +type = quality +weight = -1 + +[values] +layer_height = 0.1 +speed_print = 30 + diff --git a/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_fast.inst.cfg b/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_fast.inst.cfg new file mode 100644 index 00000000000..230fbe42303 --- /dev/null +++ b/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_fast.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = trimaker_nebula_plus +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 22 +type = quality +weight = 1 + +[values] +layer_height = 0.3 +speed_print = 60 + diff --git a/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_normal.inst.cfg b/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_normal.inst.cfg new file mode 100644 index 00000000000..ab99a176bde --- /dev/null +++ b/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_normal.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = trimaker_nebula_plus +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 22 +type = quality +weight = 0 + +[values] +layer_height = 0.2 +speed_print = 45 + diff --git a/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_slow.inst.cfg b/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_slow.inst.cfg new file mode 100644 index 00000000000..59d82465b00 --- /dev/null +++ b/resources/quality/trimaker_nebula_plus/trimaker_nebula_plus_slow.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = trimaker_nebula_plus +name = Slow +version = 4 + +[metadata] +global_quality = True +quality_type = slow +setting_version = 22 +type = quality +weight = -1 + +[values] +layer_height = 0.1 +speed_print = 30 +