diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index f5233124d6..d536466b66 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -8,15 +8,20 @@ "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoeasy200.stl", - "platform_offset": [0, -29, -11], + "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_width": { "default_value": 205 }, diff --git a/resources/definitions/dagoma_discoultimate.def.json b/resources/definitions/dagoma_discoultimate.def.json index 42b24ffdd4..fbd285fc3f 100644 --- a/resources/definitions/dagoma_discoultimate.def.json +++ b/resources/definitions/dagoma_discoultimate.def.json @@ -8,15 +8,20 @@ "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoultimate.stl", - "platform_offset": [0, -29.5, -11], + "platform_offset": [0, -19, -11], "has_machine_quality": true, "has_materials": true, + "preferred_material": "chromatik_pla", "machine_extruder_trains": { - "0": "dagoma_discoultimate_extruder_0" + "0": "dagoma_discoultimate_extruder_0", + "1": "dagoma_discoultimate_extruder_1" } }, "overrides": { + "machine_extruder_count": { + "default_value": 2 + }, "machine_width": { "default_value": 205 }, diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json index b536afd0b5..2c8ebcd7e7 100644 --- a/resources/definitions/dagoma_magis.def.json +++ b/resources/definitions/dagoma_magis.def.json @@ -11,6 +11,7 @@ "platform_offset": [0, -28, -35], "has_machine_quality": true, "has_materials": true, + "preferred_material": "chromatik_pla", "machine_extruder_trains": { "0": "dagoma_magis_extruder_0" diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 9d1e5b667a..78c55f5ac0 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -11,6 +11,7 @@ "platform_offset": [0, -28, -35], "has_machine_quality": true, "has_materials": true, + "preferred_material": "chromatik_pla", "machine_extruder_trains": { "0": "dagoma_neva_extruder_0" 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..a5e132eda3 --- /dev/null +++ b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json @@ -0,0 +1,21 @@ +{ + "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 + } + } +} 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..d2a527fc98 --- /dev/null +++ b/resources/extruders/dagoma_discoultimate_extruder_1.def.json @@ -0,0 +1,21 @@ +{ + "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 + } + } +} diff --git a/resources/meshes/dagoma_discoeasy200.stl b/resources/meshes/dagoma_discoeasy200.stl index 3414816a27..0008a9e156 100644 Binary files a/resources/meshes/dagoma_discoeasy200.stl and b/resources/meshes/dagoma_discoeasy200.stl differ diff --git a/resources/meshes/dagoma_discoultimate.stl b/resources/meshes/dagoma_discoultimate.stl index f79d2a280f..7163a337f1 100644 Binary files a/resources/meshes/dagoma_discoultimate.stl and b/resources/meshes/dagoma_discoultimate.stl differ