From 050ab5006296816fac0f032b699a97d85b9e900a Mon Sep 17 00:00:00 2001 From: yyh1002 Date: Sat, 15 Feb 2020 18:46:51 +1100 Subject: [PATCH 1/3] DXU defenition --- resources/definitions/dxu.def.json | 200 ++++++++++++++++++++ resources/definitions/dxu_dual.def.json | 203 +++++++++++++++++++++ resources/extruders/dxu_extruder1.def.json | 22 +++ resources/extruders/dxu_extruder2.def.json | 22 +++ resources/images/dxu_backplate.png | Bin 0 -> 16169 bytes resources/variants/dxu_0.25.inst.cfg | 13 ++ resources/variants/dxu_0.4.inst.cfg | 13 ++ resources/variants/dxu_0.6.inst.cfg | 13 ++ resources/variants/dxu_0.8.inst.cfg | 13 ++ resources/variants/dxu_dual_0.25.inst.cfg | 13 ++ resources/variants/dxu_dual_0.4.inst.cfg | 13 ++ resources/variants/dxu_dual_0.6.inst.cfg | 13 ++ resources/variants/dxu_dual_0.8.inst.cfg | 13 ++ 13 files changed, 551 insertions(+) create mode 100644 resources/definitions/dxu.def.json create mode 100644 resources/definitions/dxu_dual.def.json create mode 100644 resources/extruders/dxu_extruder1.def.json create mode 100644 resources/extruders/dxu_extruder2.def.json create mode 100644 resources/images/dxu_backplate.png create mode 100644 resources/variants/dxu_0.25.inst.cfg create mode 100644 resources/variants/dxu_0.4.inst.cfg create mode 100644 resources/variants/dxu_0.6.inst.cfg create mode 100644 resources/variants/dxu_0.8.inst.cfg create mode 100644 resources/variants/dxu_dual_0.25.inst.cfg create mode 100644 resources/variants/dxu_dual_0.4.inst.cfg create mode 100644 resources/variants/dxu_dual_0.6.inst.cfg create mode 100644 resources/variants/dxu_dual_0.8.inst.cfg diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json new file mode 100644 index 0000000000..547d1ecb15 --- /dev/null +++ b/resources/definitions/dxu.def.json @@ -0,0 +1,200 @@ +{ + "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": 2, + "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 + }, + "gantry_height": { + "default_value": 52 + }, + "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_layer_0": { + "default_value": 20 + }, + "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": { + "default_value": 0, + "value": "retraction_amount", + "enabled": false + }, + "switch_extruder_retraction_speeds": { + "default_value": 25, + "value": "retraction_speed", + "enabled": false + }, + "switch_extruder_retraction_speed": { + "default_value": 25, + "value": "retraction_retract_speed", + "enabled": false + }, + "switch_extruder_prime_speed": { + "default_value": 25, + "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" : { + "default_value": "", + "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" : { + "default_value": "", + "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 }, + "start_layers_at_same_position": + { + "default_value": false, + "enabled": false, + "value": 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..9b515a1d4b --- /dev/null +++ b/resources/definitions/dxu_dual.def.json @@ -0,0 +1,203 @@ +{ + "version": 2, + "name": "DXU Dual", + "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": 2, + "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 + }, + "gantry_height": { + "default_value": 52 + }, + "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_layer_0": { + "default_value": 20 + }, + "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": { + "default_value": 0, + "value": "retraction_amount", + "enabled": false + }, + "switch_extruder_retraction_speeds": { + "default_value": 25, + "value": "retraction_speed", + "enabled": false + }, + "switch_extruder_retraction_speed": { + "default_value": 25, + "value": "retraction_retract_speed", + "enabled": false + }, + "switch_extruder_prime_speed": { + "default_value": 25, + "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" : { + "default_value": "", + "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" : { + "default_value": "", + "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 }, + "start_layers_at_same_position": + { + "default_value": false, + "enabled": false, + "value": false + }, + "prime_tower_enable": { + "default_value": true + }, + "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/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json new file mode 100644 index 0000000000..f076ddd496 --- /dev/null +++ b/resources/extruders/dxu_extruder1.def.json @@ -0,0 +1,22 @@ +{ + "id": "dxu_extruder1", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "dxu", + "position": "0", + "quality_definition": "dxu_extruder1" + }, + + "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..4ad2006458 --- /dev/null +++ b/resources/extruders/dxu_extruder2.def.json @@ -0,0 +1,22 @@ +{ + "id": "dxu_extruder2", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "dxu", + "position": "1", + "quality_definition": "dxu_extruder2" + }, + + "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/images/dxu_backplate.png b/resources/images/dxu_backplate.png new file mode 100644 index 0000000000000000000000000000000000000000..cb58733a1187a77c9733ed837891978609513c93 GIT binary patch literal 16169 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 K@RvHScm5mW{;_}n literal 0 HcmV?d00001 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 From b49a1e35f807958155356e78cf22966e66ff3de9 Mon Sep 17 00:00:00 2001 From: yyh1002 Date: Wed, 19 Feb 2020 22:45:26 +1100 Subject: [PATCH 2/3] DXU profile --- resources/definitions/dxu.def.json | 24 +-- resources/definitions/dxu_dual.def.json | 172 +-------------------- resources/extruders/dxu_extruder1.def.json | 4 +- resources/extruders/dxu_extruder2.def.json | 4 +- 4 files changed, 10 insertions(+), 194 deletions(-) diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index 547d1ecb15..ba077c177b 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -12,7 +12,7 @@ "has_machine_materials": false, "has_machine_quality": false, "has_variant_materials": false, - "weight": 2, + "weight": 0, "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", @@ -26,7 +26,9 @@ "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"] }, "overrides": { - "machine_name": { "default_value": "dxu" }, + "machine_name": { + "default_value": "dxu" + }, "machine_width": { "default_value": 238 }, @@ -113,22 +115,18 @@ "default_value": 25 }, "switch_extruder_retraction_amount": { - "default_value": 0, "value": "retraction_amount", "enabled": false }, "switch_extruder_retraction_speeds": { - "default_value": 25, "value": "retraction_speed", "enabled": false }, "switch_extruder_retraction_speed": { - "default_value": 25, "value": "retraction_retract_speed", "enabled": false }, "switch_extruder_prime_speed": { - "default_value": 25, "value": "retraction_prime_speed", "enabled": false }, @@ -148,11 +146,9 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode" : { - "default_value": "", "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" : { - "default_value": "", "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": { @@ -162,19 +158,11 @@ "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 }, - "start_layers_at_same_position": - { - "default_value": false, - "enabled": false, - "value": false - }, - "layer_start_x": - { + "layer_start_x": { "default_value": 180.0, "enabled": false }, - "layer_start_y": - { + "layer_start_y": { "default_value": 160.0, "enabled": false }, diff --git a/resources/definitions/dxu_dual.def.json b/resources/definitions/dxu_dual.def.json index 9b515a1d4b..d6137fa4db 100644 --- a/resources/definitions/dxu_dual.def.json +++ b/resources/definitions/dxu_dual.def.json @@ -1,173 +1,14 @@ { "version": 2, "name": "DXU Dual", - "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": 2, - "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"] - }, + "inherits": "dxu", "overrides": { - "machine_name": { "default_value": "dxu" }, - "machine_width": { - "default_value": 238 - }, - "machine_depth": { - "default_value": 223 - }, - "machine_height": { - "default_value": 203 - }, - "gantry_height": { - "default_value": 52 - }, - "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_layer_0": { - "default_value": 20 - }, - "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": { - "default_value": 0, - "value": "retraction_amount", - "enabled": false - }, - "switch_extruder_retraction_speeds": { - "default_value": 25, - "value": "retraction_speed", - "enabled": false - }, - "switch_extruder_retraction_speed": { - "default_value": 25, - "value": "retraction_retract_speed", - "enabled": false - }, - "switch_extruder_prime_speed": { - "default_value": 25, - "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" : { - "default_value": "", "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" : { - "default_value": "", "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 }, - "start_layers_at_same_position": - { - "default_value": false, - "enabled": false, - "value": false - }, "prime_tower_enable": { "default_value": true }, @@ -189,15 +30,6 @@ }, "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/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index f076ddd496..0a01881441 100644 --- a/resources/extruders/dxu_extruder1.def.json +++ b/resources/extruders/dxu_extruder1.def.json @@ -1,12 +1,10 @@ { - "id": "dxu_extruder1", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { "machine": "dxu", - "position": "0", - "quality_definition": "dxu_extruder1" + "position": "0" }, "overrides": { diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json index 4ad2006458..5e730c49f4 100644 --- a/resources/extruders/dxu_extruder2.def.json +++ b/resources/extruders/dxu_extruder2.def.json @@ -1,12 +1,10 @@ { - "id": "dxu_extruder2", "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", "metadata": { "machine": "dxu", - "position": "1", - "quality_definition": "dxu_extruder2" + "position": "1" }, "overrides": { From f9a719ac69a9c3b66f7c727a173c7ec8e8e293fb Mon Sep 17 00:00:00 2001 From: yyh1002 Date: Wed, 19 Feb 2020 22:55:08 +1100 Subject: [PATCH 3/3] DXU profile --- resources/definitions/dxu.def.json | 6 ------ resources/definitions/dxu_dual.def.json | 19 ------------------- 2 files changed, 25 deletions(-) diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index ba077c177b..e39cbba126 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -38,9 +38,6 @@ "machine_height": { "default_value": 203 }, - "gantry_height": { - "default_value": 52 - }, "machine_center_is_zero": { "default_value": false }, @@ -87,9 +84,6 @@ "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - "speed_layer_0": { - "default_value": 20 - }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/dxu_dual.def.json b/resources/definitions/dxu_dual.def.json index d6137fa4db..ebd126c142 100644 --- a/resources/definitions/dxu_dual.def.json +++ b/resources/definitions/dxu_dual.def.json @@ -11,25 +11,6 @@ }, "prime_tower_enable": { "default_value": true - }, - "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 } } }