diff --git a/resources/definitions/dagoma_delta.def.json b/resources/definitions/dagoma_delta.def.json new file mode 100644 index 0000000000..6ff837e757 --- /dev/null +++ b/resources/definitions/dagoma_delta.def.json @@ -0,0 +1,68 @@ +{ + "name": "Dagoma Delta", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Dagoma", + "manufacturer": "Dagoma" + }, + "overrides": { + "machine_width": { + "default_value": 195.55 + }, + "machine_height": { + "default_value": 205 + }, + "machine_depth": { + "default_value": 195.55 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-36, -42], + [-36, 42], + [36, 42], + [36, -42] + ] + }, + "gantry_height": { + "value": "0" + }, + "machine_shape": { + "default_value": "elliptic" + }, + "machine_start_gcode": { + "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n" + }, + "machine_end_gcode": { + "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" + }, + "default_material_print_temperature": { + "default_value": 205 + }, + "speed_print": { + "default_value": 40 + }, + "retraction_amount": { + "default_value": 3.8 + }, + "retraction_speed": { + "default_value": 60 + }, + "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_disco.def.json b/resources/definitions/dagoma_disco.def.json new file mode 100644 index 0000000000..a62948c9a7 --- /dev/null +++ b/resources/definitions/dagoma_disco.def.json @@ -0,0 +1,62 @@ +{ + "name": "Dagoma Disco", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Dagoma", + "manufacturer": "Dagoma" + }, + "overrides": { + "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" + }, + "default_material_print_temperature": { + "default_value": 205 + }, + "material_standby_temperature": { + "default_value": 90 + }, + "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_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 1032a249f8..16ce5585e4 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -1,82 +1,34 @@ { "name": "Dagoma DiscoEasy200", "version": 2, - "inherits": "fdmprinter", + "inherits": "dagoma_disco", "metadata": { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoeasy200.3mf", - "platform_offset": [0, -57.3, -11], + "platform_offset": [0, -57, -39], "has_machine_quality": true, "has_materials": true, "preferred_material": "chromatik_pla", "machine_extruder_trains": { - "0": "dagoma_discoeasy200_extruder_0", - "1": "dagoma_discoeasy200_extruder_1" + "0": "dagoma_discoeasy200_extruder" } }, "overrides": { + "machine_name": { + "default_value": "Dagoma DiscoEasy200" + }, "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" + "default_value": 1 }, "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" + "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200\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 + "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG0 Z+3 ;Withdraw\nG90 ;Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200\n" } } } diff --git a/resources/definitions/dagoma_discoeasy200_bicolor.def.json b/resources/definitions/dagoma_discoeasy200_bicolor.def.json new file mode 100644 index 0000000000..4786c03fc2 --- /dev/null +++ b/resources/definitions/dagoma_discoeasy200_bicolor.def.json @@ -0,0 +1,38 @@ +{ + "name": "Dagoma DiscoEasy200 Bicolor", + "version": 2, + "inherits": "dagoma_disco", + "metadata": { + "visible": true, + "author": "Dagoma", + "manufacturer": "Dagoma", + "file_formats": "text/x-gcode", + "platform": "dagoma_discoeasy200_bicolor.3mf", + "platform_offset": [0, -57.3, -11], + "has_machine_quality": true, + "has_materials": true, + "preferred_material": "chromatik_pla", + "machine_extruder_trains": + { + "0": "dagoma_discoeasy200_extruder_0", + "1": "dagoma_discoeasy200_extruder_1" + } + }, + "overrides": { + "machine_name": { + "default_value": "Dagoma DiscoEasy200 Bicolor" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200 Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200 Bicolor\n" + }, + "machine_end_gcode": { + "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200 Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200 Bicolor\n" + } + } +} diff --git a/resources/definitions/dagoma_discoultimate.def.json b/resources/definitions/dagoma_discoultimate.def.json index 13ab591212..e560a80d45 100644 --- a/resources/definitions/dagoma_discoultimate.def.json +++ b/resources/definitions/dagoma_discoultimate.def.json @@ -1,82 +1,34 @@ { "name": "Dagoma DiscoUltimate", "version": 2, - "inherits": "fdmprinter", + "inherits": "dagoma_disco", "metadata": { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoultimate.3mf", - "platform_offset": [0, -58.5, -11], + "platform_offset": [0, -29.1, 18], "has_machine_quality": true, "has_materials": true, "preferred_material": "chromatik_pla", "machine_extruder_trains": { - "0": "dagoma_discoultimate_extruder_0", - "1": "dagoma_discoultimate_extruder_1" + "0": "dagoma_discoultimate_extruder" } }, "overrides": { + "machine_name": { + "default_value": "Dagoma DiscoUltimate" + }, "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" + "default_value": 1 }, "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" + "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate\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 + "default_value": ";Begin End Gcode for Dagoma DiscoUltimate\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG0 Z+3 ;Withdraw\nG90 ;Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate\n" } } } diff --git a/resources/definitions/dagoma_discoultimate_bicolor.def.json b/resources/definitions/dagoma_discoultimate_bicolor.def.json new file mode 100644 index 0000000000..3b5215c944 --- /dev/null +++ b/resources/definitions/dagoma_discoultimate_bicolor.def.json @@ -0,0 +1,38 @@ +{ + "name": "Dagoma DiscoUltimate Bicolor", + "version": 2, + "inherits": "dagoma_disco", + "metadata": { + "visible": true, + "author": "Dagoma", + "manufacturer": "Dagoma", + "file_formats": "text/x-gcode", + "platform": "dagoma_discoultimate_bicolor.3mf", + "platform_offset": [0, -58.5, -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_name": { + "default_value": "Dagoma DiscoUltimate Bicolor" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate Bicolor\n" + }, + "machine_end_gcode": { + "default_value": ";Begin End Gcode for Dagoma DiscoUltimate Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate Bicolor\n" + } + } +} diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json index e7c0847e7e..e3c9c3e693 100644 --- a/resources/definitions/dagoma_magis.def.json +++ b/resources/definitions/dagoma_magis.def.json @@ -1,7 +1,7 @@ { "name": "Dagoma Magis", "version": 2, - "inherits": "fdmprinter", + "inherits": "dagoma_delta", "metadata": { "visible": true, "author": "Dagoma", @@ -14,65 +14,12 @@ "preferred_material": "chromatik_pla", "machine_extruder_trains": { - "0": "dagoma_magis_extruder_0" + "0": "dagoma_magis_extruder" } }, "overrides": { - "machine_width": { - "default_value": 195.55 - }, - "machine_height": { - "default_value": 205 - }, - "machine_depth": { - "default_value": 195.55 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-36, -42], - [-36, 42], - [36, 42], - [36, -42] - ] - }, - "gantry_height": { - "value": "0" - }, - "machine_shape": { - "default_value": "elliptic" - }, - "machine_start_gcode": { - "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n" - }, - "machine_end_gcode": { - "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" - }, - "default_material_print_temperature": { - "default_value": 205 - }, - "speed_print": { - "default_value": 40 - }, - "retraction_amount": { - "default_value": 3.8 - }, - "retraction_speed": { - "default_value": 60 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_line_count": { - "default_value": 2 - }, - "layer_height_0": { - "default_value": 0.26 - }, - "top_bottom_thickness": { - "default_value": 1 + "machine_name": { + "default_value": "Dagoma Magis" } } } diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index f6a6ccf511..24d3f8ab8d 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -1,7 +1,7 @@ { - "name": "Dagoma NEVA", + "name": "Dagoma Neva", "version": 2, - "inherits": "fdmprinter", + "inherits": "dagoma_delta", "metadata": { "visible": true, "author": "Dagoma", @@ -14,65 +14,12 @@ "preferred_material": "chromatik_pla", "machine_extruder_trains": { - "0": "dagoma_neva_extruder_0" + "0": "dagoma_neva_extruder" } }, "overrides": { - "machine_width": { - "default_value": 195.55 - }, - "machine_height": { - "default_value": 205 - }, - "machine_depth": { - "default_value": 195.55 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-36, -42], - [-36, 42], - [36, 42], - [36, -42] - ] - }, - "gantry_height": { - "value": "0" - }, - "machine_shape": { - "default_value": "elliptic" - }, - "machine_start_gcode": { - "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n" - }, - "machine_end_gcode": { - "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" - }, - "default_material_print_temperature": { - "default_value": 205 - }, - "speed_print": { - "default_value": 40 - }, - "retraction_amount": { - "default_value": 3.8 - }, - "retraction_speed": { - "default_value": 60 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_line_count": { - "default_value": 2 - }, - "layer_height_0": { - "default_value": 0.26 - }, - "top_bottom_thickness": { - "default_value": 1 + "machine_name": { + "default_value": "Dagoma Neva" } } } diff --git a/resources/extruders/dagoma_discoeasy200_extruder.def.json b/resources/extruders/dagoma_discoeasy200_extruder.def.json new file mode 100644 index 0000000000..7bef0a7649 --- /dev/null +++ b/resources/extruders/dagoma_discoeasy200_extruder.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_discoeasy200", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json index f2ca729582..af1c2c42e9 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "dagoma_discoeasy200", + "machine": "dagoma_discoeasy200_bicolor", "position": "0" }, @@ -18,10 +18,10 @@ "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" + "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, "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" + "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0" } } } diff --git a/resources/extruders/dagoma_discoeasy200_extruder_1.def.json b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json index ac5fe5015d..f01a805270 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_1.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json @@ -3,7 +3,7 @@ "name": "Extruder 2", "inherits": "fdmextruder", "metadata": { - "machine": "dagoma_discoeasy200", + "machine": "dagoma_discoeasy200_bicolor", "position": "1" }, @@ -18,10 +18,10 @@ "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" + "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, "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" + "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1" } } } diff --git a/resources/extruders/dagoma_discoultimate_extruder.def.json b/resources/extruders/dagoma_discoultimate_extruder.def.json new file mode 100644 index 0000000000..a53145f429 --- /dev/null +++ b/resources/extruders/dagoma_discoultimate_extruder.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder", + "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 + } + } +} diff --git a/resources/extruders/dagoma_discoultimate_extruder_0.def.json b/resources/extruders/dagoma_discoultimate_extruder_0.def.json index 878d6fdc75..766d5b2902 100644 --- a/resources/extruders/dagoma_discoultimate_extruder_0.def.json +++ b/resources/extruders/dagoma_discoultimate_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "dagoma_discoultimate", + "machine": "dagoma_discoultimate_bicolor", "position": "0" }, @@ -18,10 +18,10 @@ "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" + "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, "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" + "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0" } } } diff --git a/resources/extruders/dagoma_discoultimate_extruder_1.def.json b/resources/extruders/dagoma_discoultimate_extruder_1.def.json index e6f8031e03..f71b875261 100644 --- a/resources/extruders/dagoma_discoultimate_extruder_1.def.json +++ b/resources/extruders/dagoma_discoultimate_extruder_1.def.json @@ -3,7 +3,7 @@ "name": "Extruder 2", "inherits": "fdmextruder", "metadata": { - "machine": "dagoma_discoultimate", + "machine": "dagoma_discoultimate_bicolor", "position": "1" }, @@ -18,10 +18,10 @@ "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" + "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, "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" + "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1" } } } diff --git a/resources/extruders/dagoma_magis_extruder_0.def.json b/resources/extruders/dagoma_magis_extruder.def.json similarity index 93% rename from resources/extruders/dagoma_magis_extruder_0.def.json rename to resources/extruders/dagoma_magis_extruder.def.json index 0a5850f2ed..06cf6127ce 100644 --- a/resources/extruders/dagoma_magis_extruder_0.def.json +++ b/resources/extruders/dagoma_magis_extruder.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Extruder 1", + "name": "Extruder", "inherits": "fdmextruder", "metadata": { "machine": "dagoma_magis", diff --git a/resources/extruders/dagoma_neva_extruder_0.def.json b/resources/extruders/dagoma_neva_extruder.def.json similarity index 93% rename from resources/extruders/dagoma_neva_extruder_0.def.json rename to resources/extruders/dagoma_neva_extruder.def.json index 95035f63f2..3fa26ab5c9 100644 --- a/resources/extruders/dagoma_neva_extruder_0.def.json +++ b/resources/extruders/dagoma_neva_extruder.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Extruder 1", + "name": "Extruder", "inherits": "fdmextruder", "metadata": { "machine": "dagoma_neva", diff --git a/resources/meshes/dagoma_discoeasy200.3mf b/resources/meshes/dagoma_discoeasy200.3mf index 9c2c674cfc..d71b5da20a 100644 Binary files a/resources/meshes/dagoma_discoeasy200.3mf and b/resources/meshes/dagoma_discoeasy200.3mf differ diff --git a/resources/meshes/dagoma_discoeasy200_bicolor.3mf b/resources/meshes/dagoma_discoeasy200_bicolor.3mf new file mode 100644 index 0000000000..9c2c674cfc Binary files /dev/null and b/resources/meshes/dagoma_discoeasy200_bicolor.3mf differ diff --git a/resources/meshes/dagoma_discoultimate.3mf b/resources/meshes/dagoma_discoultimate.3mf index 71b1e4dfba..f68fe2677c 100644 Binary files a/resources/meshes/dagoma_discoultimate.3mf and b/resources/meshes/dagoma_discoultimate.3mf differ diff --git a/resources/meshes/dagoma_discoultimate_bicolor.3mf b/resources/meshes/dagoma_discoultimate_bicolor.3mf new file mode 100644 index 0000000000..71b1e4dfba Binary files /dev/null and b/resources/meshes/dagoma_discoultimate_bicolor.3mf differ diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg new file mode 100644 index 0000000000..8e126094cc --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fast +definition = dagoma_discoeasy200_bicolor + +[metadata] +setting_version = 15 +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_discoeasy200_bicolor_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg new file mode 100644 index 0000000000..b26282ecb7 --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = dagoma_discoeasy200_bicolor + +[metadata] +setting_version = 15 +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_discoeasy200_bicolor_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg new file mode 100644 index 0000000000..6bc4310ce4 --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = dagoma_discoeasy200_bicolor + +[metadata] +setting_version = 15 +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_discoultimate_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg new file mode 100644 index 0000000000..c08bd89d1e --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fast +definition = dagoma_discoultimate_bicolor + +[metadata] +setting_version = 15 +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_bicolor_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg new file mode 100644 index 0000000000..7795d6aaa9 --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = dagoma_discoultimate_bicolor + +[metadata] +setting_version = 15 +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_bicolor_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg new file mode 100644 index 0000000000..7015261d3b --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = dagoma_discoultimate_bicolor + +[metadata] +setting_version = 15 +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