diff --git a/resources/definitions/smoothie_dual.def.json b/resources/definitions/smoothie.def.json similarity index 57% rename from resources/definitions/smoothie_dual.def.json rename to resources/definitions/smoothie.def.json index 9b168a0cd7..5fce686161 100644 --- a/resources/definitions/smoothie_dual.def.json +++ b/resources/definitions/smoothie.def.json @@ -1,49 +1,33 @@ { "version": 2, - "name": "Smoothie Dual Custom", + "name": "Smoothie Custom Printer", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "grk3010", "manufacturer": "Custom", + "category": "Custom", "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_variants": true, - "preferred_variant_name": "Mosquito Magnum 0.8", - "preferred_quality_type": "normal", - "variants_name": "Nozzle", "machine_extruder_trains": { - "0": "bondtech_bmgx2m_extruder_0", - "1": "bondtech_bmgx2m_extruder_1" - } + "0": "custom_extruder_1", + "1": "custom_extruder_2", + "2": "custom_extruder_3", + "3": "custom_extruder_4", + "4": "custom_extruder_5", + "5": "custom_extruder_6", + "6": "custom_extruder_7", + "7": "custom_extruder_8" + }, + "first_start_actions": ["MachineSettingsAction"] }, "overrides": { - "machine_name": { "default_value": "Smoothie Dual Custom" }, - "machine_width": { - "default_value": 600 - }, - "machine_depth": { - "default_value": 550 - }, - "machine_height": { - "default_value": 500 - }, - "machine_center_is_zero": { - "default_value": false - }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_always_write_active_tool": { "default_value": true }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_heat_zone_length": { - "default_value": 15 - }, "machine_start_gcode": { "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" }, diff --git a/resources/extruders/bondtech_bmgx2m_extruder_0.def.json b/resources/extruders/bondtech_bmgx2m_extruder_0.def.json deleted file mode 100644 index 80c853e56a..0000000000 --- a/resources/extruders/bondtech_bmgx2m_extruder_0.def.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "smoothie_dual", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.8 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/bondtech_bmgx2m_extruder_1.def.json b/resources/extruders/bondtech_bmgx2m_extruder_1.def.json deleted file mode 100644 index 2c5f193bc6..0000000000 --- a/resources/extruders/bondtech_bmgx2m_extruder_1.def.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "smoothie_dual", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "2" - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.8 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg deleted file mode 100644 index 8b10ee1e20..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Normal -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = fast -weight = -1 -variant = Mosquito Magnum 0.4 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.25 -wall_line_count = 4 -bottom_layers = 4 -top_layers = 4 -infill_pattern = grid -infill_sparse_density = 50 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg deleted file mode 100644 index 974c8a42ea..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = high -weight = 1 -variant = Mosquito Magnum 0.4 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.25 -wall_line_count = 3 -bottom_layers = 3 -top_layers = 3 -infill_pattern = grid -infill_sparse_density = 50 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg deleted file mode 100644 index b64a3f5168..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Fine -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = normal -weight = 0 -variant = Mosquito Magnum 0.4 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.25 -wall_line_count = 3 -bottom_layers = 3 -top_layers = 3 -infill_pattern = grid -infill_sparse_density = 30 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg deleted file mode 100644 index 2fbd0e8061..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = superdraft -weight = -1 -variant = Mosquito Magnum 0.8 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.4 -wall_line_count = 2 -bottom_layers = 2 -top_layers = 2 -infill_pattern = lines -infill_sparse_density = 20 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg deleted file mode 100644 index 75e75c2635..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Dense -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = draft -weight = 1 -variant = Mosquito Magnum 0.8 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.4 -wall_line_count = 4 -bottom_layers = 4 -top_layers = 4 -infill_pattern = grid -infill_sparse_density = 50 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg deleted file mode 100644 index b021f9a54a..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Fast -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = 0 -variant = Mosquito Magnum 0.8 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.4 -wall_line_count = 3 -bottom_layers = 3 -top_layers = 3 -infill_pattern = grid -infill_sparse_density = 30 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/variants/mosquito_magnum_0.4.inst.cfg b/resources/variants/mosquito_magnum_0.4.inst.cfg deleted file mode 100644 index a8486d7b5c..0000000000 --- a/resources/variants/mosquito_magnum_0.4.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -name = Mosquito Magnum 0.4 -version = 4 -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = Mosquito Magnum 0.4 -machine_nozzle_tip_outer_diameter = 2.0 -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -skin_overlap = 15 -speed_print = 60 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length - diff --git a/resources/variants/mosquito_magnum_0.8.inst.cfg b/resources/variants/mosquito_magnum_0.8.inst.cfg deleted file mode 100644 index eac2bab60a..0000000000 --- a/resources/variants/mosquito_magnum_0.8.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -name = Mosquito Magnum 0.8 -version = 4 -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = Mosquito Magnum 0.8 -machine_nozzle_tip_outer_diameter = 2.0 -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -skin_overlap = 15 -speed_print = 60 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length -