diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 30c0abdab2..a16260a649 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -7,24 +7,32 @@ "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", - "platform": "discoeasy200.stl", - "platform_offset": [ 105, -59, 280], + "platform": "dagoma_discoeasy200.stl", + "platform_offset": [0, -19, -11], "has_machine_quality": true, "has_materials": true, + "preferred_material": "chromatik_pla", "machine_extruder_trains": { - "0": "dagoma_discoeasy200_extruder_0" + "0": "dagoma_discoeasy200_extruder_0", + "1": "dagoma_discoeasy200_extruder_1" } }, "overrides": { + "machine_extruder_count": { + "default_value": 2 + }, + "machine_extruders_share_heater": { + "default_value": true + }, "machine_width": { - "default_value": 211 + "default_value": 205 }, "machine_height": { "default_value": 205 }, "machine_depth": { - "default_value": 211 + "default_value": 205 }, "machine_center_is_zero": { "default_value": false @@ -66,6 +74,9 @@ }, "layer_height_0": { "default_value": 0.26 + }, + "top_bottom_thickness": { + "default_value": 1 } } } diff --git a/resources/definitions/dagoma_discoultimate.def.json b/resources/definitions/dagoma_discoultimate.def.json new file mode 100644 index 0000000000..05ed1a8db9 --- /dev/null +++ b/resources/definitions/dagoma_discoultimate.def.json @@ -0,0 +1,82 @@ +{ + "name": "Dagoma DiscoUltimate", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Dagoma", + "manufacturer": "Dagoma", + "file_formats": "text/x-gcode", + "platform": "dagoma_discoultimate.stl", + "platform_offset": [0, -19, -11], + "has_machine_quality": true, + "has_materials": true, + "preferred_material": "chromatik_pla", + "machine_extruder_trains": + { + "0": "dagoma_discoultimate_extruder_0", + "1": "dagoma_discoultimate_extruder_1" + } + }, + "overrides": { + "machine_extruder_count": { + "default_value": 2 + }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_width": { + "default_value": 205 + }, + "machine_height": { + "default_value": 205 + }, + "machine_depth": { + "default_value": 205 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-17, -70], + [-17, 40], + [17, 40], + [17, -70] + ] + }, + "gantry_height": { + "value": "10" + }, + "machine_start_gcode": { + "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n" + }, + "machine_end_gcode": { + "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n" + }, + "default_material_print_temperature": { + "default_value": 205 + }, + "speed_print": { + "default_value": 60 + }, + "retraction_amount": { + "default_value": 3.5 + }, + "retraction_speed": { + "default_value": 50 + }, + "adhesion_type": { + "default_value": "skirt" + }, + "skirt_line_count": { + "default_value": 2 + }, + "layer_height_0": { + "default_value": 0.26 + }, + "top_bottom_thickness": { + "default_value": 1 + } + } +} diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json index dc5a0f86d2..d8864d336f 100644 --- a/resources/definitions/dagoma_magis.def.json +++ b/resources/definitions/dagoma_magis.def.json @@ -7,10 +7,11 @@ "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", - "platform": "neva.stl", - "platform_offset": [ 0, 0, 0], + "platform": "dagoma_magis.stl", + "platform_offset": [0, -28, -35], "has_machine_quality": true, "has_materials": true, + "preferred_material": "chromatik_pla", "machine_extruder_trains": { "0": "dagoma_magis_extruder_0" @@ -69,6 +70,9 @@ }, "layer_height_0": { "default_value": 0.26 + }, + "top_bottom_thickness": { + "default_value": 1 } } } diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 43a3e0c4f1..f81b17a85c 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -7,10 +7,11 @@ "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", - "platform": "neva.stl", - "platform_offset": [ 0, 0, 0], + "platform": "dagoma_neva.stl", + "platform_offset": [0, -28, -35], "has_machine_quality": true, "has_materials": true, + "preferred_material": "chromatik_pla", "machine_extruder_trains": { "0": "dagoma_neva_extruder_0" @@ -69,6 +70,9 @@ }, "layer_height_0": { "default_value": 0.26 + }, + "top_bottom_thickness": { + "default_value": 1 } } } diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json index c885ac971e..f2ca729582 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json @@ -16,6 +16,12 @@ }, "material_diameter": { "default_value": 1.75 + }, + "machine_extruder_start_code": { + "default_value": "\n;Start T0\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n" + }, + "machine_extruder_end_code": { + "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T0\n\n" } } } diff --git a/resources/extruders/dagoma_discoeasy200_extruder_1.def.json b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json new file mode 100644 index 0000000000..ac5fe5015d --- /dev/null +++ b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_discoeasy200", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_extruder_start_code": { + "default_value": "\n;Start T1\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n" + }, + "machine_extruder_end_code": { + "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T1\n\n" + } + } +} diff --git a/resources/extruders/dagoma_discoultimate_extruder_0.def.json b/resources/extruders/dagoma_discoultimate_extruder_0.def.json new file mode 100644 index 0000000000..878d6fdc75 --- /dev/null +++ b/resources/extruders/dagoma_discoultimate_extruder_0.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_discoultimate", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_extruder_start_code": { + "default_value": "\n;Start T0\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n" + }, + "machine_extruder_end_code": { + "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T0\n\n" + } + } +} diff --git a/resources/extruders/dagoma_discoultimate_extruder_1.def.json b/resources/extruders/dagoma_discoultimate_extruder_1.def.json new file mode 100644 index 0000000000..e6f8031e03 --- /dev/null +++ b/resources/extruders/dagoma_discoultimate_extruder_1.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_discoultimate", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_extruder_start_code": { + "default_value": "\n;Start T1\nG92 E0\nG1 E-{retraction_amount} F10000\nG92 E0G1 E1.5 F3000\nG1 E-60 F10000\nG92 E0\n" + }, + "machine_extruder_end_code": { + "default_value": "\nG92 E0\nG1 E{retraction_amount} F3000\nG92 E0\nG1 E60 F3000\nG92 E0\nG1 E-{retraction_amount} F5000\n;End T1\n\n" + } + } +} diff --git a/resources/meshes/dagoma_discoeasy200.stl b/resources/meshes/dagoma_discoeasy200.stl new file mode 100644 index 0000000000..c58ae20408 Binary files /dev/null and b/resources/meshes/dagoma_discoeasy200.stl differ diff --git a/resources/meshes/dagoma_discoultimate.stl b/resources/meshes/dagoma_discoultimate.stl new file mode 100644 index 0000000000..5dbd2f8caa Binary files /dev/null and b/resources/meshes/dagoma_discoultimate.stl differ diff --git a/resources/meshes/dagoma_magis.stl b/resources/meshes/dagoma_magis.stl new file mode 100644 index 0000000000..d09f8bd122 Binary files /dev/null and b/resources/meshes/dagoma_magis.stl differ diff --git a/resources/meshes/dagoma_neva.stl b/resources/meshes/dagoma_neva.stl new file mode 100644 index 0000000000..59dceb25dd Binary files /dev/null and b/resources/meshes/dagoma_neva.stl differ diff --git a/resources/meshes/discoeasy200.stl b/resources/meshes/discoeasy200.stl deleted file mode 100644 index 381df45b24..0000000000 Binary files a/resources/meshes/discoeasy200.stl and /dev/null differ diff --git a/resources/meshes/neva.stl b/resources/meshes/neva.stl deleted file mode 100644 index 72ec185bd9..0000000000 Binary files a/resources/meshes/neva.stl and /dev/null differ diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index 9963cb3acd..8b9b79d59c 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -8,8 +8,19 @@ setting_version = 11 type = quality quality_type = draft weight = -2 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.2 +line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 + +speed_print = 60 +speed_travel = 75 +speed_layer_0 = 17 +speed_infill = 60 +speed_wall_0 = 50 +speed_wall_x = 60 +speed_topbottom = 60 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 954b804dd4..ba16551895 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -8,6 +8,16 @@ setting_version = 11 type = quality quality_type = normal weight = 0 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.1 +line_width = =machine_nozzle_size * 0.875 + +speed_print = 35 +speed_travel = 50 +speed_layer_0 = 15 +speed_infill = 40 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 35 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 8dd6db539b..5e52ca1054 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -8,8 +8,19 @@ setting_version = 11 type = quality quality_type = fast weight = -1 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.15 +line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 + +speed_print = 50 +speed_travel = 60 +speed_layer_0 = 17 +speed_infill = 50 +speed_wall_0 = 40 +speed_wall_x = 45 +speed_topbottom = 50 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg new file mode 100644 index 0000000000..8facbbe6bb --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fast +definition = dagoma_discoultimate + +[metadata] +setting_version = 11 +type = quality +quality_type = draft +weight = -2 +material = chromatik_pla + +[values] +layer_height = 0.2 +line_width = =machine_nozzle_size * 0.875 + +material_print_temperature = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 + +speed_print = 60 +speed_travel = 75 +speed_layer_0 = 17 +speed_infill = 60 +speed_wall_0 = 50 +speed_wall_x = 60 +speed_topbottom = 60 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg new file mode 100644 index 0000000000..3ff02714c7 --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = dagoma_discoultimate + +[metadata] +setting_version = 11 +type = quality +quality_type = normal +weight = 0 +material = chromatik_pla + +[values] +layer_height = 0.1 +line_width = =machine_nozzle_size * 0.875 + +speed_print = 35 +speed_travel = 50 +speed_layer_0 = 15 +speed_infill = 40 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 35 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg new file mode 100644 index 0000000000..a7775dee08 --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = dagoma_discoultimate + +[metadata] +setting_version = 11 +type = quality +quality_type = fast +weight = -1 +material = chromatik_pla + +[values] +layer_height = 0.15 +line_width = =machine_nozzle_size * 0.875 + +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 + +speed_print = 50 +speed_travel = 60 +speed_layer_0 = 17 +speed_infill = 50 +speed_wall_0 = 40 +speed_wall_x = 45 +speed_topbottom = 50 diff --git a/resources/quality/dagoma/dagoma_global_fast.inst.cfg b/resources/quality/dagoma/dagoma_global_fast.inst.cfg deleted file mode 100644 index 93057f6803..0000000000 --- a/resources/quality/dagoma/dagoma_global_fast.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Fast -definition = dagoma_discoeasy200 - -[metadata] -setting_version = 11 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.2 diff --git a/resources/quality/dagoma/dagoma_global_fine.inst.cfg b/resources/quality/dagoma/dagoma_global_fine.inst.cfg deleted file mode 100644 index 32db1de5c7..0000000000 --- a/resources/quality/dagoma/dagoma_global_fine.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Fine -definition = dagoma_discoeasy200 - -[metadata] -setting_version = 11 -type = quality -quality_type = normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_global_standard.inst.cfg b/resources/quality/dagoma/dagoma_global_standard.inst.cfg deleted file mode 100644 index 2ccfb6d406..0000000000 --- a/resources/quality/dagoma/dagoma_global_standard.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Standard -definition = dagoma_discoeasy200 - -[metadata] -setting_version = 11 -type = quality -quality_type = fast -weight = -1 -global_quality = True - -[values] -layer_height = 0.15 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index 91fa81ba7c..6419202322 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -8,8 +8,19 @@ setting_version = 11 type = quality quality_type = draft weight = -2 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.2 +line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 + +speed_print = 40 +speed_travel = 80 +speed_layer_0 = 17 +speed_infill = 40 +speed_wall_0 = 30 +speed_wall_x = 40 +speed_topbottom = 40 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index 1e135166b0..93c6c1b626 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -8,6 +8,16 @@ setting_version = 11 type = quality quality_type = normal weight = 0 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.1 +line_width = =machine_nozzle_size * 0.875 + +speed_print = 30 +speed_travel = 80 +speed_layer_0 = 17 +speed_infill = 30 +speed_wall_0 = 20 +speed_wall_x = 30 +speed_topbottom = 30 diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index 297f21f9f1..329643a6b7 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -8,8 +8,19 @@ setting_version = 11 type = quality quality_type = fast weight = -1 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.15 +line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 + +speed_print = 35 +speed_travel = 80 +speed_layer_0 = 17 +speed_infill = 35 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 35 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 7be90b9db3..5e97365186 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -8,8 +8,19 @@ setting_version = 11 type = quality quality_type = draft weight = -2 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.2 +line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 + +speed_print = 40 +speed_travel = 80 +speed_layer_0 = 17 +speed_infill = 40 +speed_wall_0 = 30 +speed_wall_x = 40 +speed_topbottom = 40 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index e5cc46fb9a..4e1196b1be 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -8,6 +8,16 @@ setting_version = 11 type = quality quality_type = normal weight = 0 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.1 +line_width = =machine_nozzle_size * 0.875 + +speed_print = 30 +speed_travel = 80 +speed_layer_0 = 17 +speed_infill = 30 +speed_wall_0 = 20 +speed_wall_x = 30 +speed_topbottom = 30 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index 6b96244f6f..84ca8e2137 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -8,8 +8,19 @@ setting_version = 11 type = quality quality_type = fast weight = -1 -material = generic_pla +material = chromatik_pla [values] +layer_height = 0.15 +line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 + +speed_print = 35 +speed_travel = 80 +speed_layer_0 = 17 +speed_infill = 35 +speed_wall_0 = 25 +speed_wall_x = 35 +speed_topbottom = 35