From 98d49d6fb929f8a0ad0f5b292df1b1e6742be518 Mon Sep 17 00:00:00 2001 From: Modix-Lazar Date: Mon, 2 May 2022 11:46:45 +0200 Subject: [PATCH 01/43] Add printer profile for Modix3D printers Adds printer profiles for the Modix V3 line of printers: the Big40, 60, 120X, 120Z, 180X and Meter --- resources/definitions/modix_base.def.json | 105 ++++++++++++++++++ resources/definitions/modix_big120X.def.json | 15 +++ resources/definitions/modix_big120Z.def.json | 15 +++ resources/definitions/modix_big180X.def.json | 15 +++ resources/definitions/modix_big40.def.json | 15 +++ resources/definitions/modix_big60.def.json | 15 +++ .../definitions/modix_big_meter.def.json | 15 +++ resources/extruders/modix_extruder_0.def.json | 17 +++ resources/extruders/modix_extruder_1.def.json | 18 +++ resources/variants/modix_base_0.4.inst.cfg | 12 ++ resources/variants/modix_base_0.6.inst.cfg | 12 ++ resources/variants/modix_base_0.8.inst.cfg | 12 ++ resources/variants/modix_base_1.0.inst.cfg | 14 +++ resources/variants/modix_base_1.2.inst.cfg | 14 +++ resources/variants/modix_base_1.4.inst.cfg | 14 +++ resources/variants/modix_big120X_0.4.inst.cfg | 12 ++ resources/variants/modix_big120X_0.6.inst.cfg | 12 ++ resources/variants/modix_big120X_0.8.inst.cfg | 12 ++ resources/variants/modix_big120X_1.0.inst.cfg | 14 +++ resources/variants/modix_big120X_1.2.inst.cfg | 14 +++ resources/variants/modix_big120X_1.4.inst.cfg | 14 +++ resources/variants/modix_big120Z_0.4.inst.cfg | 12 ++ resources/variants/modix_big120Z_0.6.inst.cfg | 12 ++ resources/variants/modix_big120Z_0.8.inst.cfg | 12 ++ resources/variants/modix_big120Z_1.0.inst.cfg | 14 +++ resources/variants/modix_big120Z_1.2.inst.cfg | 14 +++ resources/variants/modix_big120Z_1.4.inst.cfg | 14 +++ resources/variants/modix_big180X_0.4.inst.cfg | 12 ++ resources/variants/modix_big180X_0.6.inst.cfg | 12 ++ resources/variants/modix_big180X_0.8.inst.cfg | 12 ++ resources/variants/modix_big180X_1.0.inst.cfg | 14 +++ resources/variants/modix_big180X_1.2.inst.cfg | 14 +++ resources/variants/modix_big180X_1.4.inst.cfg | 14 +++ resources/variants/modix_big40_0.4.inst.cfg | 12 ++ resources/variants/modix_big40_0.6.inst.cfg | 12 ++ resources/variants/modix_big40_0.8.inst.cfg | 12 ++ resources/variants/modix_big40_1.0.inst.cfg | 14 +++ resources/variants/modix_big40_1.2.inst.cfg | 14 +++ resources/variants/modix_big40_1.4.inst.cfg | 14 +++ resources/variants/modix_big60_0.4.inst.cfg | 12 ++ resources/variants/modix_big60_0.6.inst.cfg | 12 ++ resources/variants/modix_big60_0.8.inst.cfg | 12 ++ resources/variants/modix_big60_1.0.inst.cfg | 14 +++ resources/variants/modix_big60_1.2.inst.cfg | 14 +++ resources/variants/modix_big60_1.4.inst.cfg | 14 +++ .../variants/modix_bigmeter_0.4.inst.cfg | 12 ++ .../variants/modix_bigmeter_0.6.inst.cfg | 12 ++ .../variants/modix_bigmeter_0.8.inst.cfg | 12 ++ .../variants/modix_bigmeter_1.0.inst.cfg | 14 +++ .../variants/modix_bigmeter_1.2.inst.cfg | 14 +++ .../variants/modix_bigmeter_1.4.inst.cfg | 14 +++ 51 files changed, 776 insertions(+) create mode 100644 resources/definitions/modix_base.def.json create mode 100644 resources/definitions/modix_big120X.def.json create mode 100644 resources/definitions/modix_big120Z.def.json create mode 100644 resources/definitions/modix_big180X.def.json create mode 100644 resources/definitions/modix_big40.def.json create mode 100644 resources/definitions/modix_big60.def.json create mode 100644 resources/definitions/modix_big_meter.def.json create mode 100644 resources/extruders/modix_extruder_0.def.json create mode 100644 resources/extruders/modix_extruder_1.def.json create mode 100644 resources/variants/modix_base_0.4.inst.cfg create mode 100644 resources/variants/modix_base_0.6.inst.cfg create mode 100644 resources/variants/modix_base_0.8.inst.cfg create mode 100644 resources/variants/modix_base_1.0.inst.cfg create mode 100644 resources/variants/modix_base_1.2.inst.cfg create mode 100644 resources/variants/modix_base_1.4.inst.cfg create mode 100644 resources/variants/modix_big120X_0.4.inst.cfg create mode 100644 resources/variants/modix_big120X_0.6.inst.cfg create mode 100644 resources/variants/modix_big120X_0.8.inst.cfg create mode 100644 resources/variants/modix_big120X_1.0.inst.cfg create mode 100644 resources/variants/modix_big120X_1.2.inst.cfg create mode 100644 resources/variants/modix_big120X_1.4.inst.cfg create mode 100644 resources/variants/modix_big120Z_0.4.inst.cfg create mode 100644 resources/variants/modix_big120Z_0.6.inst.cfg create mode 100644 resources/variants/modix_big120Z_0.8.inst.cfg create mode 100644 resources/variants/modix_big120Z_1.0.inst.cfg create mode 100644 resources/variants/modix_big120Z_1.2.inst.cfg create mode 100644 resources/variants/modix_big120Z_1.4.inst.cfg create mode 100644 resources/variants/modix_big180X_0.4.inst.cfg create mode 100644 resources/variants/modix_big180X_0.6.inst.cfg create mode 100644 resources/variants/modix_big180X_0.8.inst.cfg create mode 100644 resources/variants/modix_big180X_1.0.inst.cfg create mode 100644 resources/variants/modix_big180X_1.2.inst.cfg create mode 100644 resources/variants/modix_big180X_1.4.inst.cfg create mode 100644 resources/variants/modix_big40_0.4.inst.cfg create mode 100644 resources/variants/modix_big40_0.6.inst.cfg create mode 100644 resources/variants/modix_big40_0.8.inst.cfg create mode 100644 resources/variants/modix_big40_1.0.inst.cfg create mode 100644 resources/variants/modix_big40_1.2.inst.cfg create mode 100644 resources/variants/modix_big40_1.4.inst.cfg create mode 100644 resources/variants/modix_big60_0.4.inst.cfg create mode 100644 resources/variants/modix_big60_0.6.inst.cfg create mode 100644 resources/variants/modix_big60_0.8.inst.cfg create mode 100644 resources/variants/modix_big60_1.0.inst.cfg create mode 100644 resources/variants/modix_big60_1.2.inst.cfg create mode 100644 resources/variants/modix_big60_1.4.inst.cfg create mode 100644 resources/variants/modix_bigmeter_0.4.inst.cfg create mode 100644 resources/variants/modix_bigmeter_0.6.inst.cfg create mode 100644 resources/variants/modix_bigmeter_0.8.inst.cfg create mode 100644 resources/variants/modix_bigmeter_1.0.inst.cfg create mode 100644 resources/variants/modix_bigmeter_1.2.inst.cfg create mode 100644 resources/variants/modix_bigmeter_1.4.inst.cfg diff --git a/resources/definitions/modix_base.def.json b/resources/definitions/modix_base.def.json new file mode 100644 index 0000000000..f8c2738021 --- /dev/null +++ b/resources/definitions/modix_base.def.json @@ -0,0 +1,105 @@ +{ + "name": "Modix Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "author": "Modix", + "manufacturer": "Modix", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "modix_extruder_0", + "1": "modix_extruder_1" + }, + + "has_variants": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4 mm Nozzle" + + }, + "overrides": { + "machine_name": { "default_value": "Modix Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes"}, + "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0 \n nG10 P1 S0 R0 ; turn off extruder1 \n M107 ; turn off fan \n G91 ;relative positioning \n G1 Z2 F500 ; Move print head up \n G90 ; absolute positioning \n G28 XY ; home X and Y axis \n M84 ; disable motors" }, + "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, + + "material_diameter": { "default_value": 1.75 }, + + "machine_head_with_fans_polygon": { "default_value": [[-100,30],[-100,65],[30,-105],[-31,-100]] }, + "gantry_height": {"value": "90.0"}, + + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": 150.0 }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size * 1.05" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + + "z_seam_corner": { "value": "z_seam_corner_weighted" }, + + "infill_sparse_density": { "value": "15" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + + "fill_outline_gaps": { "value": false }, + + "retraction_speed": { "default_value": 40 }, + "retraction_retract_speed": { "value": 40 }, + "retraction_prime_speed": { "value": 40 }, + + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_hop": { "value": 2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 5 }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_amount": { "value": 1 }, + "retraction_count_max": { "value": 50 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + + "adhesion_type": { "default_value": "skirt" }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 3 }, + + "support_angle": { "value": 55 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.2 else layer_height * 2" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 40 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/modix_big120X.def.json b/resources/definitions/modix_big120X.def.json new file mode 100644 index 0000000000..cba0d9a720 --- /dev/null +++ b/resources/definitions/modix_big120X.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix BIG-120X V3", + "version": 2, + "inherits": "modix_base", + "overrides": { + "machine_name": { "default_value": "Modix BIG-120X V3" }, + "machine_width": { "default_value": 1200 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 640 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_big120Z.def.json b/resources/definitions/modix_big120Z.def.json new file mode 100644 index 0000000000..e94eec6f00 --- /dev/null +++ b/resources/definitions/modix_big120Z.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix BIG-120Z V3", + "version": 2, + "inherits": "modix_base", + "overrides": { + "machine_name": { "default_value": "Modix BIG-120Z V3" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 1200 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_big180X.def.json b/resources/definitions/modix_big180X.def.json new file mode 100644 index 0000000000..079e0e6cd4 --- /dev/null +++ b/resources/definitions/modix_big180X.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix BIG-180X V3", + "version": 2, + "inherits": "modix_base", + "overrides": { + "machine_name": { "default_value": "Modix BIG-180X V3" }, + "machine_width": { "default_value": 1800 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 600 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_big40.def.json b/resources/definitions/modix_big40.def.json new file mode 100644 index 0000000000..de0aff553b --- /dev/null +++ b/resources/definitions/modix_big40.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix BIG-40 V3", + "version": 2, + "inherits": "modix_base", + "overrides": { + "machine_name": { "default_value": "Modix BIG-40 V3" }, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 800 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_big60.def.json b/resources/definitions/modix_big60.def.json new file mode 100644 index 0000000000..df1e7b042b --- /dev/null +++ b/resources/definitions/modix_big60.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix BIG-60 V3", + "version": 2, + "inherits": "modix_base", + "overrides": { + "machine_name": { "default_value": "Modix BIG-60 V3" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 660 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_big_meter.def.json b/resources/definitions/modix_big_meter.def.json new file mode 100644 index 0000000000..d3dabae9b3 --- /dev/null +++ b/resources/definitions/modix_big_meter.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix BIG-Meter V3", + "version": 2, + "inherits": "modix_base", + "overrides": { + "machine_name": { "default_value": "Modix BIG-Meter V3" }, + "machine_width": { "default_value": 1000 }, + "machine_depth": { "default_value": 1000 }, + "machine_height": { "default_value": 1000 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/extruders/modix_extruder_0.def.json b/resources/extruders/modix_extruder_0.def.json new file mode 100644 index 0000000000..5783fe2d01 --- /dev/null +++ b/resources/extruders/modix_extruder_0.def.json @@ -0,0 +1,17 @@ +{ + "name": "Left Extruder", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "modix_base", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/modix_extruder_1.def.json b/resources/extruders/modix_extruder_1.def.json new file mode 100644 index 0000000000..64bfd8e92e --- /dev/null +++ b/resources/extruders/modix_extruder_1.def.json @@ -0,0 +1,18 @@ +{ + "name": "Right Extruder", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "modix_base", + "position": "1" + }, + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_cooling_fan_number": { "default_value": 1 } + } +} \ No newline at end of file diff --git a/resources/variants/modix_base_0.4.inst.cfg b/resources/variants/modix_base_0.4.inst.cfg new file mode 100644 index 0000000000..d580b66cb8 --- /dev/null +++ b/resources/variants/modix_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_base + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_base_0.6.inst.cfg b/resources/variants/modix_base_0.6.inst.cfg new file mode 100644 index 0000000000..77b4eac077 --- /dev/null +++ b/resources/variants/modix_base_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = modix_base + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_base_0.8.inst.cfg b/resources/variants/modix_base_0.8.inst.cfg new file mode 100644 index 0000000000..bee840ebb8 --- /dev/null +++ b/resources/variants/modix_base_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = modix_base + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_base_1.0.inst.cfg b/resources/variants/modix_base_1.0.inst.cfg new file mode 100644 index 0000000000..da1eae8b32 --- /dev/null +++ b/resources/variants/modix_base_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = modix_base + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_base_1.2.inst.cfg b/resources/variants/modix_base_1.2.inst.cfg new file mode 100644 index 0000000000..8b9491c852 --- /dev/null +++ b/resources/variants/modix_base_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2mm Nozzle +version = 4 +definition = modix_base + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_base_1.4.inst.cfg b/resources/variants/modix_base_1.4.inst.cfg new file mode 100644 index 0000000000..bf81b14bfb --- /dev/null +++ b/resources/variants/modix_base_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_base + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120X_0.4.inst.cfg b/resources/variants/modix_big120X_0.4.inst.cfg new file mode 100644 index 0000000000..f480e254e3 --- /dev/null +++ b/resources/variants/modix_big120X_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_big120X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big120X_0.6.inst.cfg b/resources/variants/modix_big120X_0.6.inst.cfg new file mode 100644 index 0000000000..545fa4b9f6 --- /dev/null +++ b/resources/variants/modix_big120X_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_big120X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_big120X_0.8.inst.cfg b/resources/variants/modix_big120X_0.8.inst.cfg new file mode 100644 index 0000000000..facdfe3764 --- /dev/null +++ b/resources/variants/modix_big120X_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_big120X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_big120X_1.0.inst.cfg b/resources/variants/modix_big120X_1.0.inst.cfg new file mode 100644 index 0000000000..f51be7a17b --- /dev/null +++ b/resources/variants/modix_big120X_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_big120X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120X_1.2.inst.cfg b/resources/variants/modix_big120X_1.2.inst.cfg new file mode 100644 index 0000000000..35a8a09dd4 --- /dev/null +++ b/resources/variants/modix_big120X_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_big120X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120X_1.4.inst.cfg b/resources/variants/modix_big120X_1.4.inst.cfg new file mode 100644 index 0000000000..7f71e23a38 --- /dev/null +++ b/resources/variants/modix_big120X_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_big120X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120Z_0.4.inst.cfg b/resources/variants/modix_big120Z_0.4.inst.cfg new file mode 100644 index 0000000000..0c832b34d8 --- /dev/null +++ b/resources/variants/modix_big120Z_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big120Z_0.6.inst.cfg b/resources/variants/modix_big120Z_0.6.inst.cfg new file mode 100644 index 0000000000..15ea4f45f5 --- /dev/null +++ b/resources/variants/modix_big120Z_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_big120Z_0.8.inst.cfg b/resources/variants/modix_big120Z_0.8.inst.cfg new file mode 100644 index 0000000000..084ca2e6d3 --- /dev/null +++ b/resources/variants/modix_big120Z_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_big120Z_1.0.inst.cfg b/resources/variants/modix_big120Z_1.0.inst.cfg new file mode 100644 index 0000000000..224dc05a2a --- /dev/null +++ b/resources/variants/modix_big120Z_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120Z_1.2.inst.cfg b/resources/variants/modix_big120Z_1.2.inst.cfg new file mode 100644 index 0000000000..80cec8091d --- /dev/null +++ b/resources/variants/modix_big120Z_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120Z_1.4.inst.cfg b/resources/variants/modix_big120Z_1.4.inst.cfg new file mode 100644 index 0000000000..6efaffca47 --- /dev/null +++ b/resources/variants/modix_big120Z_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big180X_0.4.inst.cfg b/resources/variants/modix_big180X_0.4.inst.cfg new file mode 100644 index 0000000000..1899ffa582 --- /dev/null +++ b/resources/variants/modix_big180X_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big180X_0.6.inst.cfg b/resources/variants/modix_big180X_0.6.inst.cfg new file mode 100644 index 0000000000..1563789ef7 --- /dev/null +++ b/resources/variants/modix_big180X_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_big180X_0.8.inst.cfg b/resources/variants/modix_big180X_0.8.inst.cfg new file mode 100644 index 0000000000..022a0ff1da --- /dev/null +++ b/resources/variants/modix_big180X_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_big180X_1.0.inst.cfg b/resources/variants/modix_big180X_1.0.inst.cfg new file mode 100644 index 0000000000..d084101eab --- /dev/null +++ b/resources/variants/modix_big180X_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big180X_1.2.inst.cfg b/resources/variants/modix_big180X_1.2.inst.cfg new file mode 100644 index 0000000000..91553b8784 --- /dev/null +++ b/resources/variants/modix_big180X_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big180X_1.4.inst.cfg b/resources/variants/modix_big180X_1.4.inst.cfg new file mode 100644 index 0000000000..1c4d8c5649 --- /dev/null +++ b/resources/variants/modix_big180X_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big40_0.4.inst.cfg b/resources/variants/modix_big40_0.4.inst.cfg new file mode 100644 index 0000000000..62107371be --- /dev/null +++ b/resources/variants/modix_big40_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_big40 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big40_0.6.inst.cfg b/resources/variants/modix_big40_0.6.inst.cfg new file mode 100644 index 0000000000..6fa44b65a6 --- /dev/null +++ b/resources/variants/modix_big40_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_big40 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_big40_0.8.inst.cfg b/resources/variants/modix_big40_0.8.inst.cfg new file mode 100644 index 0000000000..b0362e3c22 --- /dev/null +++ b/resources/variants/modix_big40_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_big40 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_big40_1.0.inst.cfg b/resources/variants/modix_big40_1.0.inst.cfg new file mode 100644 index 0000000000..76111c9404 --- /dev/null +++ b/resources/variants/modix_big40_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_big40 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big40_1.2.inst.cfg b/resources/variants/modix_big40_1.2.inst.cfg new file mode 100644 index 0000000000..73fa553ca1 --- /dev/null +++ b/resources/variants/modix_big40_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_big40 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big40_1.4.inst.cfg b/resources/variants/modix_big40_1.4.inst.cfg new file mode 100644 index 0000000000..672e8ac3e2 --- /dev/null +++ b/resources/variants/modix_big40_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_big40 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big60_0.4.inst.cfg b/resources/variants/modix_big60_0.4.inst.cfg new file mode 100644 index 0000000000..e4c3dc8cfa --- /dev/null +++ b/resources/variants/modix_big60_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big60_0.6.inst.cfg b/resources/variants/modix_big60_0.6.inst.cfg new file mode 100644 index 0000000000..47da9dc99a --- /dev/null +++ b/resources/variants/modix_big60_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_big60_0.8.inst.cfg b/resources/variants/modix_big60_0.8.inst.cfg new file mode 100644 index 0000000000..cda33bb931 --- /dev/null +++ b/resources/variants/modix_big60_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_big60_1.0.inst.cfg b/resources/variants/modix_big60_1.0.inst.cfg new file mode 100644 index 0000000000..8a018bd3ef --- /dev/null +++ b/resources/variants/modix_big60_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big60_1.2.inst.cfg b/resources/variants/modix_big60_1.2.inst.cfg new file mode 100644 index 0000000000..04777de7b9 --- /dev/null +++ b/resources/variants/modix_big60_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big60_1.4.inst.cfg b/resources/variants/modix_big60_1.4.inst.cfg new file mode 100644 index 0000000000..f52ab11cb0 --- /dev/null +++ b/resources/variants/modix_big60_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_0.4.inst.cfg b/resources/variants/modix_bigmeter_0.4.inst.cfg new file mode 100644 index 0000000000..fd702debe3 --- /dev/null +++ b/resources/variants/modix_bigmeter_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_0.6.inst.cfg b/resources/variants/modix_bigmeter_0.6.inst.cfg new file mode 100644 index 0000000000..1b2e40f232 --- /dev/null +++ b/resources/variants/modix_bigmeter_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_0.8.inst.cfg b/resources/variants/modix_bigmeter_0.8.inst.cfg new file mode 100644 index 0000000000..2c9d8f162c --- /dev/null +++ b/resources/variants/modix_bigmeter_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_1.0.inst.cfg b/resources/variants/modix_bigmeter_1.0.inst.cfg new file mode 100644 index 0000000000..4a366431cb --- /dev/null +++ b/resources/variants/modix_bigmeter_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_1.2.inst.cfg b/resources/variants/modix_bigmeter_1.2.inst.cfg new file mode 100644 index 0000000000..3a46ba6544 --- /dev/null +++ b/resources/variants/modix_bigmeter_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_1.4.inst.cfg b/resources/variants/modix_bigmeter_1.4.inst.cfg new file mode 100644 index 0000000000..66ebad4340 --- /dev/null +++ b/resources/variants/modix_bigmeter_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file From be61b45f30a49522a7e53e9f10f353503729f24e Mon Sep 17 00:00:00 2001 From: Modix-Lazar Date: Wed, 9 Nov 2022 19:35:47 +0100 Subject: [PATCH 02/43] Added Modix V4 machines - Adding V4 machines - Initial layer height set depending on nozzle diameter - Z-hop set as 4x layer height - V4 travel speed set to 350mm/sec --- resources/definitions/modix_v3_base.def.json | 108 ++++++++++++++++++ ...20X.def.json => modix_v3_big120X.def.json} | 6 +- ...20Z.def.json => modix_v3_big120Z.def.json} | 6 +- ...80X.def.json => modix_v3_big180X.def.json} | 6 +- ...big40.def.json => modix_v3_big40.def.json} | 6 +- ...big60.def.json => modix_v3_big60.def.json} | 6 +- ...r.def.json => modix_v3_big_meter.def.json} | 6 +- ...x_base.def.json => modix_v4_base.def.json} | 11 +- .../definitions/modix_v4_big120X.def.json | 15 +++ .../definitions/modix_v4_big120Z.def.json | 15 +++ .../definitions/modix_v4_big180X.def.json | 15 +++ resources/definitions/modix_v4_big60.def.json | 15 +++ .../definitions/modix_v4_big_meter.def.json | 15 +++ ....def.json => modix_v3_extruder_0.def.json} | 2 +- ....def.json => modix_v3_extruder_1.def.json} | 5 +- .../extruders/modix_v4_extruder_0.def.json | 17 +++ .../extruders/modix_v4_extruder_1.def.json | 17 +++ resources/variants/modix_base_0.6.inst.cfg | 12 -- resources/variants/modix_base_0.8.inst.cfg | 12 -- resources/variants/modix_base_1.0.inst.cfg | 14 --- resources/variants/modix_base_1.2.inst.cfg | 14 --- resources/variants/modix_big40_0.4.inst.cfg | 12 -- resources/variants/modix_big40_1.4.inst.cfg | 14 --- resources/variants/modix_big60_0.4.inst.cfg | 12 -- resources/variants/modix_big60_0.6.inst.cfg | 12 -- resources/variants/modix_big60_0.8.inst.cfg | 12 -- resources/variants/modix_big60_1.0.inst.cfg | 14 --- resources/variants/modix_big60_1.2.inst.cfg | 14 --- resources/variants/modix_big60_1.4.inst.cfg | 14 --- .../variants/modix_bigmeter_0.4.inst.cfg | 12 -- .../variants/modix_bigmeter_0.6.inst.cfg | 12 -- .../variants/modix_bigmeter_0.8.inst.cfg | 12 -- .../variants/modix_bigmeter_1.0.inst.cfg | 14 --- .../variants/modix_bigmeter_1.2.inst.cfg | 14 --- .../variants/modix_bigmeter_1.4.inst.cfg | 14 --- ....4.inst.cfg => modix_v3_base_0.4.inst.cfg} | 2 +- ....6.inst.cfg => modix_v3_base_0.6.inst.cfg} | 2 +- ....8.inst.cfg => modix_v3_base_0.8.inst.cfg} | 2 +- ....0.inst.cfg => modix_v3_base_1.0.inst.cfg} | 2 +- ....2.inst.cfg => modix_v3_base_1.2.inst.cfg} | 2 +- ....4.inst.cfg => modix_v3_base_1.4.inst.cfg} | 2 +- .../variants/modix_v3_big120X_0.4.inst.cfg | 12 ++ .../variants/modix_v3_big120X_0.6.inst.cfg | 12 ++ .../variants/modix_v3_big120X_0.8.inst.cfg | 12 ++ .../variants/modix_v3_big120X_1.0.inst.cfg | 14 +++ .../variants/modix_v3_big120X_1.2.inst.cfg | 14 +++ .../variants/modix_v3_big120X_1.4.inst.cfg | 14 +++ .../variants/modix_v3_big120Z_0.4.inst.cfg | 12 ++ .../variants/modix_v3_big120Z_0.6.inst.cfg | 12 ++ .../variants/modix_v3_big120Z_0.8.inst.cfg | 12 ++ .../variants/modix_v3_big120Z_1.0.inst.cfg | 14 +++ .../variants/modix_v3_big120Z_1.2.inst.cfg | 14 +++ .../variants/modix_v3_big120Z_1.4.inst.cfg | 14 +++ .../variants/modix_v3_big180X_0.4.inst.cfg | 12 ++ .../variants/modix_v3_big180X_0.6.inst.cfg | 12 ++ .../variants/modix_v3_big180X_0.8.inst.cfg | 12 ++ .../variants/modix_v3_big180X_1.0.inst.cfg | 14 +++ .../variants/modix_v3_big180X_1.2.inst.cfg | 14 +++ .../variants/modix_v3_big180X_1.4.inst.cfg | 14 +++ ...4.inst.cfg => modix_v3_big40_0.4.inst.cfg} | 2 +- ...6.inst.cfg => modix_v3_big40_0.6.inst.cfg} | 2 +- ...8.inst.cfg => modix_v3_big40_0.8.inst.cfg} | 2 +- ...0.inst.cfg => modix_v3_big40_1.0.inst.cfg} | 2 +- ...2.inst.cfg => modix_v3_big40_1.2.inst.cfg} | 2 +- ...4.inst.cfg => modix_v3_big40_1.4.inst.cfg} | 2 +- ...4.inst.cfg => modix_v3_big60_0.4.inst.cfg} | 2 +- ...6.inst.cfg => modix_v3_big60_0.6.inst.cfg} | 2 +- ...8.inst.cfg => modix_v3_big60_0.8.inst.cfg} | 2 +- ...0.inst.cfg => modix_v3_big60_1.0.inst.cfg} | 2 +- ...2.inst.cfg => modix_v3_big60_1.2.inst.cfg} | 4 +- ...4.inst.cfg => modix_v3_big60_1.4.inst.cfg} | 2 +- .../variants/modix_v3_bigmeter_0.4.inst.cfg | 12 ++ .../variants/modix_v3_bigmeter_0.6.inst.cfg | 12 ++ .../variants/modix_v3_bigmeter_0.8.inst.cfg | 12 ++ .../variants/modix_v3_bigmeter_1.0.inst.cfg | 14 +++ .../variants/modix_v3_bigmeter_1.2.inst.cfg | 14 +++ .../variants/modix_v3_bigmeter_1.4.inst.cfg | 14 +++ ....4.inst.cfg => modix_v4_base_0.4.inst.cfg} | 2 +- ....6.inst.cfg => modix_v4_base_0.6.inst.cfg} | 2 +- ....8.inst.cfg => modix_v4_base_0.8.inst.cfg} | 2 +- ....0.inst.cfg => modix_v4_base_1.0.inst.cfg} | 2 +- ....2.inst.cfg => modix_v4_base_1.2.inst.cfg} | 2 +- ....4.inst.cfg => modix_v4_base_1.4.inst.cfg} | 2 +- .../variants/modix_v4_big120X_0.4.inst.cfg | 12 ++ .../variants/modix_v4_big120X_0.6.inst.cfg | 12 ++ .../variants/modix_v4_big120X_0.8.inst.cfg | 12 ++ .../variants/modix_v4_big120X_1.0.inst.cfg | 14 +++ .../variants/modix_v4_big120X_1.2.inst.cfg | 14 +++ .../variants/modix_v4_big120X_1.4.inst.cfg | 14 +++ .../variants/modix_v4_big120Z_0.4.inst.cfg | 12 ++ .../variants/modix_v4_big120Z_0.6.inst.cfg | 12 ++ .../variants/modix_v4_big120Z_0.8.inst.cfg | 12 ++ .../variants/modix_v4_big120Z_1.0.inst.cfg | 14 +++ .../variants/modix_v4_big120Z_1.2.inst.cfg | 14 +++ .../variants/modix_v4_big120Z_1.4.inst.cfg | 14 +++ .../variants/modix_v4_big180X_0.4.inst.cfg | 12 ++ .../variants/modix_v4_big180X_0.6.inst.cfg | 12 ++ .../variants/modix_v4_big180X_0.8.inst.cfg | 12 ++ .../variants/modix_v4_big180X_1.0.inst.cfg | 14 +++ .../variants/modix_v4_big180X_1.2.inst.cfg | 14 +++ .../variants/modix_v4_big180X_1.4.inst.cfg | 14 +++ .../variants/modix_v4_big60_0.4.inst.cfg | 12 ++ .../variants/modix_v4_big60_0.6.inst.cfg | 12 ++ .../variants/modix_v4_big60_0.8.inst.cfg | 12 ++ .../variants/modix_v4_big60_1.0.inst.cfg | 14 +++ .../variants/modix_v4_big60_1.2.inst.cfg | 14 +++ .../variants/modix_v4_big60_1.4.inst.cfg | 14 +++ .../variants/modix_v4_bigmeter_0.4.inst.cfg | 12 ++ .../variants/modix_v4_bigmeter_0.6.inst.cfg | 12 ++ .../variants/modix_v4_bigmeter_0.8.inst.cfg | 12 ++ .../variants/modix_v4_bigmeter_1.0.inst.cfg | 14 +++ .../variants/modix_v4_bigmeter_1.2.inst.cfg | 14 +++ .../variants/modix_v4_bigmeter_1.4.inst.cfg | 14 +++ 113 files changed, 972 insertions(+), 285 deletions(-) create mode 100644 resources/definitions/modix_v3_base.def.json rename resources/definitions/{modix_big120X.def.json => modix_v3_big120X.def.json} (66%) rename resources/definitions/{modix_big120Z.def.json => modix_v3_big120Z.def.json} (66%) rename resources/definitions/{modix_big180X.def.json => modix_v3_big180X.def.json} (66%) rename resources/definitions/{modix_big40.def.json => modix_v3_big40.def.json} (66%) rename resources/definitions/{modix_big60.def.json => modix_v3_big60.def.json} (66%) rename resources/definitions/{modix_big_meter.def.json => modix_v3_big_meter.def.json} (66%) rename resources/definitions/{modix_base.def.json => modix_v4_base.def.json} (90%) create mode 100644 resources/definitions/modix_v4_big120X.def.json create mode 100644 resources/definitions/modix_v4_big120Z.def.json create mode 100644 resources/definitions/modix_v4_big180X.def.json create mode 100644 resources/definitions/modix_v4_big60.def.json create mode 100644 resources/definitions/modix_v4_big_meter.def.json rename resources/extruders/{modix_extruder_0.def.json => modix_v3_extruder_0.def.json} (91%) rename resources/extruders/{modix_extruder_1.def.json => modix_v3_extruder_1.def.json} (66%) create mode 100644 resources/extruders/modix_v4_extruder_0.def.json create mode 100644 resources/extruders/modix_v4_extruder_1.def.json delete mode 100644 resources/variants/modix_base_0.6.inst.cfg delete mode 100644 resources/variants/modix_base_0.8.inst.cfg delete mode 100644 resources/variants/modix_base_1.0.inst.cfg delete mode 100644 resources/variants/modix_base_1.2.inst.cfg delete mode 100644 resources/variants/modix_big40_0.4.inst.cfg delete mode 100644 resources/variants/modix_big40_1.4.inst.cfg delete mode 100644 resources/variants/modix_big60_0.4.inst.cfg delete mode 100644 resources/variants/modix_big60_0.6.inst.cfg delete mode 100644 resources/variants/modix_big60_0.8.inst.cfg delete mode 100644 resources/variants/modix_big60_1.0.inst.cfg delete mode 100644 resources/variants/modix_big60_1.2.inst.cfg delete mode 100644 resources/variants/modix_big60_1.4.inst.cfg delete mode 100644 resources/variants/modix_bigmeter_0.4.inst.cfg delete mode 100644 resources/variants/modix_bigmeter_0.6.inst.cfg delete mode 100644 resources/variants/modix_bigmeter_0.8.inst.cfg delete mode 100644 resources/variants/modix_bigmeter_1.0.inst.cfg delete mode 100644 resources/variants/modix_bigmeter_1.2.inst.cfg delete mode 100644 resources/variants/modix_bigmeter_1.4.inst.cfg rename resources/variants/{modix_base_0.4.inst.cfg => modix_v3_base_0.4.inst.cfg} (70%) rename resources/variants/{modix_big120X_0.6.inst.cfg => modix_v3_base_0.6.inst.cfg} (70%) rename resources/variants/{modix_big120X_0.8.inst.cfg => modix_v3_base_0.8.inst.cfg} (70%) rename resources/variants/{modix_big120Z_1.0.inst.cfg => modix_v3_base_1.0.inst.cfg} (77%) rename resources/variants/{modix_big40_1.2.inst.cfg => modix_v3_base_1.2.inst.cfg} (77%) rename resources/variants/{modix_big120X_1.4.inst.cfg => modix_v3_base_1.4.inst.cfg} (77%) create mode 100644 resources/variants/modix_v3_big120X_0.4.inst.cfg create mode 100644 resources/variants/modix_v3_big120X_0.6.inst.cfg create mode 100644 resources/variants/modix_v3_big120X_0.8.inst.cfg create mode 100644 resources/variants/modix_v3_big120X_1.0.inst.cfg create mode 100644 resources/variants/modix_v3_big120X_1.2.inst.cfg create mode 100644 resources/variants/modix_v3_big120X_1.4.inst.cfg create mode 100644 resources/variants/modix_v3_big120Z_0.4.inst.cfg create mode 100644 resources/variants/modix_v3_big120Z_0.6.inst.cfg create mode 100644 resources/variants/modix_v3_big120Z_0.8.inst.cfg create mode 100644 resources/variants/modix_v3_big120Z_1.0.inst.cfg create mode 100644 resources/variants/modix_v3_big120Z_1.2.inst.cfg create mode 100644 resources/variants/modix_v3_big120Z_1.4.inst.cfg create mode 100644 resources/variants/modix_v3_big180X_0.4.inst.cfg create mode 100644 resources/variants/modix_v3_big180X_0.6.inst.cfg create mode 100644 resources/variants/modix_v3_big180X_0.8.inst.cfg create mode 100644 resources/variants/modix_v3_big180X_1.0.inst.cfg create mode 100644 resources/variants/modix_v3_big180X_1.2.inst.cfg create mode 100644 resources/variants/modix_v3_big180X_1.4.inst.cfg rename resources/variants/{modix_big180X_0.4.inst.cfg => modix_v3_big40_0.4.inst.cfg} (70%) rename resources/variants/{modix_big180X_0.6.inst.cfg => modix_v3_big40_0.6.inst.cfg} (70%) rename resources/variants/{modix_big180X_0.8.inst.cfg => modix_v3_big40_0.8.inst.cfg} (70%) rename resources/variants/{modix_big180X_1.0.inst.cfg => modix_v3_big40_1.0.inst.cfg} (76%) rename resources/variants/{modix_big120Z_1.2.inst.cfg => modix_v3_big40_1.2.inst.cfg} (76%) rename resources/variants/{modix_base_1.4.inst.cfg => modix_v3_big40_1.4.inst.cfg} (76%) rename resources/variants/{modix_big120X_0.4.inst.cfg => modix_v3_big60_0.4.inst.cfg} (70%) rename resources/variants/{modix_big40_0.6.inst.cfg => modix_v3_big60_0.6.inst.cfg} (70%) rename resources/variants/{modix_big40_0.8.inst.cfg => modix_v3_big60_0.8.inst.cfg} (70%) rename resources/variants/{modix_big120X_1.0.inst.cfg => modix_v3_big60_1.0.inst.cfg} (76%) rename resources/variants/{modix_big180X_1.2.inst.cfg => modix_v3_big60_1.2.inst.cfg} (76%) rename resources/variants/{modix_big180X_1.4.inst.cfg => modix_v3_big60_1.4.inst.cfg} (76%) create mode 100644 resources/variants/modix_v3_bigmeter_0.4.inst.cfg create mode 100644 resources/variants/modix_v3_bigmeter_0.6.inst.cfg create mode 100644 resources/variants/modix_v3_bigmeter_0.8.inst.cfg create mode 100644 resources/variants/modix_v3_bigmeter_1.0.inst.cfg create mode 100644 resources/variants/modix_v3_bigmeter_1.2.inst.cfg create mode 100644 resources/variants/modix_v3_bigmeter_1.4.inst.cfg rename resources/variants/{modix_big120Z_0.4.inst.cfg => modix_v4_base_0.4.inst.cfg} (70%) rename resources/variants/{modix_big120Z_0.6.inst.cfg => modix_v4_base_0.6.inst.cfg} (70%) rename resources/variants/{modix_big120Z_0.8.inst.cfg => modix_v4_base_0.8.inst.cfg} (70%) rename resources/variants/{modix_big40_1.0.inst.cfg => modix_v4_base_1.0.inst.cfg} (77%) rename resources/variants/{modix_big120X_1.2.inst.cfg => modix_v4_base_1.2.inst.cfg} (77%) rename resources/variants/{modix_big120Z_1.4.inst.cfg => modix_v4_base_1.4.inst.cfg} (77%) create mode 100644 resources/variants/modix_v4_big120X_0.4.inst.cfg create mode 100644 resources/variants/modix_v4_big120X_0.6.inst.cfg create mode 100644 resources/variants/modix_v4_big120X_0.8.inst.cfg create mode 100644 resources/variants/modix_v4_big120X_1.0.inst.cfg create mode 100644 resources/variants/modix_v4_big120X_1.2.inst.cfg create mode 100644 resources/variants/modix_v4_big120X_1.4.inst.cfg create mode 100644 resources/variants/modix_v4_big120Z_0.4.inst.cfg create mode 100644 resources/variants/modix_v4_big120Z_0.6.inst.cfg create mode 100644 resources/variants/modix_v4_big120Z_0.8.inst.cfg create mode 100644 resources/variants/modix_v4_big120Z_1.0.inst.cfg create mode 100644 resources/variants/modix_v4_big120Z_1.2.inst.cfg create mode 100644 resources/variants/modix_v4_big120Z_1.4.inst.cfg create mode 100644 resources/variants/modix_v4_big180X_0.4.inst.cfg create mode 100644 resources/variants/modix_v4_big180X_0.6.inst.cfg create mode 100644 resources/variants/modix_v4_big180X_0.8.inst.cfg create mode 100644 resources/variants/modix_v4_big180X_1.0.inst.cfg create mode 100644 resources/variants/modix_v4_big180X_1.2.inst.cfg create mode 100644 resources/variants/modix_v4_big180X_1.4.inst.cfg create mode 100644 resources/variants/modix_v4_big60_0.4.inst.cfg create mode 100644 resources/variants/modix_v4_big60_0.6.inst.cfg create mode 100644 resources/variants/modix_v4_big60_0.8.inst.cfg create mode 100644 resources/variants/modix_v4_big60_1.0.inst.cfg create mode 100644 resources/variants/modix_v4_big60_1.2.inst.cfg create mode 100644 resources/variants/modix_v4_big60_1.4.inst.cfg create mode 100644 resources/variants/modix_v4_bigmeter_0.4.inst.cfg create mode 100644 resources/variants/modix_v4_bigmeter_0.6.inst.cfg create mode 100644 resources/variants/modix_v4_bigmeter_0.8.inst.cfg create mode 100644 resources/variants/modix_v4_bigmeter_1.0.inst.cfg create mode 100644 resources/variants/modix_v4_bigmeter_1.2.inst.cfg create mode 100644 resources/variants/modix_v4_bigmeter_1.4.inst.cfg diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json new file mode 100644 index 0000000000..9451c25655 --- /dev/null +++ b/resources/definitions/modix_v3_base.def.json @@ -0,0 +1,108 @@ +{ + "name": "Modix Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "author": "Modix", + "manufacturer": "Modix", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "modix_v3_extruder_0", + "1": "modix_v3_extruder_1" + }, + + "has_variants": true, + "variants_name": "Nozzle Size", + "preferred_variant_name": "0.4 mm Nozzle" + + }, + "overrides": { + "machine_name": { "default_value": "Modix Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes"}, + "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0\n nG10 P1 S0 R0 ; turn off extruder1\n M107 ; turn off fan\n G91 ;relative positioning\n G1 Z2 F500 ; Move print head up\n G90 ; absolute positioning\n G28 XY ; home X and Y axis\n M84 ; disable motors" }, + "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, + + "material_diameter": { "default_value": 1.75 }, + + "machine_head_with_fans_polygon": { "default_value": [[-100,30],[-100,65],[30,-105],[-31,-100]] }, + "gantry_height": {"value": "90.0"}, + + "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, + + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": 150.0 }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size * 1.05" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + + "z_seam_corner": { "value": "z_seam_corner_weighted" }, + + "infill_sparse_density": { "value": "15" }, + "infill_pattern": { "value": "'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + + "fill_outline_gaps": { "value": false }, + + "retraction_speed": { "default_value": 40 }, + "retraction_retract_speed": { "value": 40 }, + "retraction_prime_speed": { "value": 40 }, + + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_hop": { "value": "layer_height*4" }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 5 }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_amount": { "value": 1 }, + "retraction_count_max": { "value": 50 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + + "adhesion_type": { "default_value": "skirt" }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 3 }, + + "support_angle": { "value": 55 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.2 else layer_height * 2" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 40 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/modix_big120X.def.json b/resources/definitions/modix_v3_big120X.def.json similarity index 66% rename from resources/definitions/modix_big120X.def.json rename to resources/definitions/modix_v3_big120X.def.json index cba0d9a720..db3acb913a 100644 --- a/resources/definitions/modix_big120X.def.json +++ b/resources/definitions/modix_v3_big120X.def.json @@ -1,9 +1,9 @@ { - "name": "Modix BIG-120X V3", + "name": "Modix V3 BIG-120X", "version": 2, - "inherits": "modix_base", + "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix BIG-120X V3" }, + "machine_name": { "default_value": "Modix V3 BIG-120X" }, "machine_width": { "default_value": 1200 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 640 } diff --git a/resources/definitions/modix_big120Z.def.json b/resources/definitions/modix_v3_big120Z.def.json similarity index 66% rename from resources/definitions/modix_big120Z.def.json rename to resources/definitions/modix_v3_big120Z.def.json index e94eec6f00..2e6a9c26ce 100644 --- a/resources/definitions/modix_big120Z.def.json +++ b/resources/definitions/modix_v3_big120Z.def.json @@ -1,9 +1,9 @@ { - "name": "Modix BIG-120Z V3", + "name": "Modix V3 BIG-120Z", "version": 2, - "inherits": "modix_base", + "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix BIG-120Z V3" }, + "machine_name": { "default_value": "Modix V3 BIG-120Z" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 1200 } diff --git a/resources/definitions/modix_big180X.def.json b/resources/definitions/modix_v3_big180X.def.json similarity index 66% rename from resources/definitions/modix_big180X.def.json rename to resources/definitions/modix_v3_big180X.def.json index 079e0e6cd4..24b714ab28 100644 --- a/resources/definitions/modix_big180X.def.json +++ b/resources/definitions/modix_v3_big180X.def.json @@ -1,9 +1,9 @@ { - "name": "Modix BIG-180X V3", + "name": "Modix V3 BIG-180X", "version": 2, - "inherits": "modix_base", + "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix BIG-180X V3" }, + "machine_name": { "default_value": "Modix V3 BIG-180X" }, "machine_width": { "default_value": 1800 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 600 } diff --git a/resources/definitions/modix_big40.def.json b/resources/definitions/modix_v3_big40.def.json similarity index 66% rename from resources/definitions/modix_big40.def.json rename to resources/definitions/modix_v3_big40.def.json index de0aff553b..1207dcc244 100644 --- a/resources/definitions/modix_big40.def.json +++ b/resources/definitions/modix_v3_big40.def.json @@ -1,9 +1,9 @@ { - "name": "Modix BIG-40 V3", + "name": "Modix V3 BIG-40", "version": 2, - "inherits": "modix_base", + "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix BIG-40 V3" }, + "machine_name": { "default_value": "Modix V3 BIG-40" }, "machine_width": { "default_value": 400 }, "machine_depth": { "default_value": 400 }, "machine_height": { "default_value": 800 } diff --git a/resources/definitions/modix_big60.def.json b/resources/definitions/modix_v3_big60.def.json similarity index 66% rename from resources/definitions/modix_big60.def.json rename to resources/definitions/modix_v3_big60.def.json index df1e7b042b..4e35f259f9 100644 --- a/resources/definitions/modix_big60.def.json +++ b/resources/definitions/modix_v3_big60.def.json @@ -1,9 +1,9 @@ { - "name": "Modix BIG-60 V3", + "name": "Modix V3 BIG-60", "version": 2, - "inherits": "modix_base", + "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix BIG-60 V3" }, + "machine_name": { "default_value": "Modix V3 BIG-60" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 660 } diff --git a/resources/definitions/modix_big_meter.def.json b/resources/definitions/modix_v3_big_meter.def.json similarity index 66% rename from resources/definitions/modix_big_meter.def.json rename to resources/definitions/modix_v3_big_meter.def.json index d3dabae9b3..3e1150f317 100644 --- a/resources/definitions/modix_big_meter.def.json +++ b/resources/definitions/modix_v3_big_meter.def.json @@ -1,9 +1,9 @@ { - "name": "Modix BIG-Meter V3", + "name": "Modix V3 BIG-Meter", "version": 2, - "inherits": "modix_base", + "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix BIG-Meter V3" }, + "machine_name": { "default_value": "Modix V3 BIG-Meter" }, "machine_width": { "default_value": 1000 }, "machine_depth": { "default_value": 1000 }, "machine_height": { "default_value": 1000 } diff --git a/resources/definitions/modix_base.def.json b/resources/definitions/modix_v4_base.def.json similarity index 90% rename from resources/definitions/modix_base.def.json rename to resources/definitions/modix_v4_base.def.json index f8c2738021..34a87d048d 100644 --- a/resources/definitions/modix_base.def.json +++ b/resources/definitions/modix_v4_base.def.json @@ -7,8 +7,8 @@ "manufacturer": "Modix", "file_formats": "text/x-gcode", "machine_extruder_trains": { - "0": "modix_extruder_0", - "1": "modix_extruder_1" + "0": "modix_v4_extruder_0", + "1": "modix_v4_extruder_1" }, "has_variants": true, @@ -19,13 +19,15 @@ "overrides": { "machine_name": { "default_value": "Modix Base Printer" }, "machine_start_gcode": { "default_value": "G28 ; home all axes"}, - "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0 \n nG10 P1 S0 R0 ; turn off extruder1 \n M107 ; turn off fan \n G91 ;relative positioning \n G1 Z2 F500 ; Move print head up \n G90 ; absolute positioning \n G28 XY ; home X and Y axis \n M84 ; disable motors" }, + "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0\n nG10 P1 S0 R0 ; turn off extruder1\n M107 ; turn off fan\n G91 ;relative positioning\n G1 Z2 F500 ; Move print head up\n G90 ; absolute positioning\n G28 XY ; home X and Y axis\n M84 ; disable motors" }, "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [[-100,30],[-100,65],[30,-105],[-31,-100]] }, "gantry_height": {"value": "90.0"}, + + "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, "speed_infill": { "value": "speed_print" }, "speed_wall": { "value": "speed_print / 2" }, @@ -33,7 +35,7 @@ "speed_wall_x": { "value": "speed_wall" }, "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": 150.0 }, + "speed_travel": { "value": 350.0 }, "speed_layer_0": { "value": 20.0 }, "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, @@ -55,6 +57,7 @@ "z_seam_corner": { "value": "z_seam_corner_weighted" }, "infill_sparse_density": { "value": "15" }, + "infill_pattern": { "value": "'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, "skin_overlap": { "value": 10.0 }, diff --git a/resources/definitions/modix_v4_big120X.def.json b/resources/definitions/modix_v4_big120X.def.json new file mode 100644 index 0000000000..e691c30d7e --- /dev/null +++ b/resources/definitions/modix_v4_big120X.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix V4 BIG-120X", + "version": 2, + "inherits": "modix_v4_base", + "overrides": { + "machine_name": { "default_value": "Modix V4 BIG-120X" }, + "machine_width": { "default_value": 1200 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 640 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_v4_big120Z.def.json b/resources/definitions/modix_v4_big120Z.def.json new file mode 100644 index 0000000000..372d48ff78 --- /dev/null +++ b/resources/definitions/modix_v4_big120Z.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix V4 BIG-120Z", + "version": 2, + "inherits": "modix_v4_base", + "overrides": { + "machine_name": { "default_value": "Modix V4 BIG-120Z" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 1200 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_v4_big180X.def.json b/resources/definitions/modix_v4_big180X.def.json new file mode 100644 index 0000000000..43ce042dd5 --- /dev/null +++ b/resources/definitions/modix_v4_big180X.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix V4 BIG-180X", + "version": 2, + "inherits": "modix_v4_base", + "overrides": { + "machine_name": { "default_value": "Modix V4 BIG-180X" }, + "machine_width": { "default_value": 1800 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 600 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_v4_big60.def.json b/resources/definitions/modix_v4_big60.def.json new file mode 100644 index 0000000000..b16486ca07 --- /dev/null +++ b/resources/definitions/modix_v4_big60.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix V4 BIG-60", + "version": 2, + "inherits": "modix_v4_base", + "overrides": { + "machine_name": { "default_value": "Modix V4 BIG-60" }, + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 660 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/definitions/modix_v4_big_meter.def.json b/resources/definitions/modix_v4_big_meter.def.json new file mode 100644 index 0000000000..8adbef1f80 --- /dev/null +++ b/resources/definitions/modix_v4_big_meter.def.json @@ -0,0 +1,15 @@ +{ + "name": "Modix V4 BIG-Meter", + "version": 2, + "inherits": "modix_v4_base", + "overrides": { + "machine_name": { "default_value": "Modix V4 BIG-Meter" }, + "machine_width": { "default_value": 1000 }, + "machine_depth": { "default_value": 1000 }, + "machine_height": { "default_value": 1000 } + + }, + "metadata": { + "visible": true + } +} diff --git a/resources/extruders/modix_extruder_0.def.json b/resources/extruders/modix_v3_extruder_0.def.json similarity index 91% rename from resources/extruders/modix_extruder_0.def.json rename to resources/extruders/modix_v3_extruder_0.def.json index 5783fe2d01..101d8217d7 100644 --- a/resources/extruders/modix_extruder_0.def.json +++ b/resources/extruders/modix_v3_extruder_0.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "fdmextruder", "metadata": { - "machine": "modix_base", + "machine": "modix_v3_base", "position": "0" }, "overrides": { diff --git a/resources/extruders/modix_extruder_1.def.json b/resources/extruders/modix_v3_extruder_1.def.json similarity index 66% rename from resources/extruders/modix_extruder_1.def.json rename to resources/extruders/modix_v3_extruder_1.def.json index 64bfd8e92e..b5fdef2233 100644 --- a/resources/extruders/modix_extruder_1.def.json +++ b/resources/extruders/modix_v3_extruder_1.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "fdmextruder", "metadata": { - "machine": "modix_base", + "machine": "modix_v3_base", "position": "1" }, "overrides": { @@ -12,7 +12,6 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_cooling_fan_number": { "default_value": 1 } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_0.def.json b/resources/extruders/modix_v4_extruder_0.def.json new file mode 100644 index 0000000000..4cce57b57b --- /dev/null +++ b/resources/extruders/modix_v4_extruder_0.def.json @@ -0,0 +1,17 @@ +{ + "name": "Left Extruder", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "modix_v4_base", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_1.def.json b/resources/extruders/modix_v4_extruder_1.def.json new file mode 100644 index 0000000000..7e52173586 --- /dev/null +++ b/resources/extruders/modix_v4_extruder_1.def.json @@ -0,0 +1,17 @@ +{ + "name": "Right Extruder", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "modix_v4_base", + "position": "1" + }, + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/variants/modix_base_0.6.inst.cfg b/resources/variants/modix_base_0.6.inst.cfg deleted file mode 100644 index 77b4eac077..0000000000 --- a/resources/variants/modix_base_0.6.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.6mm Nozzle -version = 4 -definition = modix_base - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_base_0.8.inst.cfg b/resources/variants/modix_base_0.8.inst.cfg deleted file mode 100644 index bee840ebb8..0000000000 --- a/resources/variants/modix_base_0.8.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.8mm Nozzle -version = 4 -definition = modix_base - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_base_1.0.inst.cfg b/resources/variants/modix_base_1.0.inst.cfg deleted file mode 100644 index da1eae8b32..0000000000 --- a/resources/variants/modix_base_1.0.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.0mm Nozzle -version = 4 -definition = modix_base - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.0 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_base_1.2.inst.cfg b/resources/variants/modix_base_1.2.inst.cfg deleted file mode 100644 index 8b9491c852..0000000000 --- a/resources/variants/modix_base_1.2.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.2mm Nozzle -version = 4 -definition = modix_base - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.2 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big40_0.4.inst.cfg b/resources/variants/modix_big40_0.4.inst.cfg deleted file mode 100644 index 62107371be..0000000000 --- a/resources/variants/modix_big40_0.4.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.4 mm Nozzle -version = 4 -definition = modix_big40 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big40_1.4.inst.cfg b/resources/variants/modix_big40_1.4.inst.cfg deleted file mode 100644 index 672e8ac3e2..0000000000 --- a/resources/variants/modix_big40_1.4.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.4 mm Nozzle -version = 4 -definition = modix_big40 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.4 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big60_0.4.inst.cfg b/resources/variants/modix_big60_0.4.inst.cfg deleted file mode 100644 index e4c3dc8cfa..0000000000 --- a/resources/variants/modix_big60_0.4.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.4 mm Nozzle -version = 4 -definition = modix_big60 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_big60_0.6.inst.cfg b/resources/variants/modix_big60_0.6.inst.cfg deleted file mode 100644 index 47da9dc99a..0000000000 --- a/resources/variants/modix_big60_0.6.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.6 mm Nozzle -version = 4 -definition = modix_big60 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_big60_0.8.inst.cfg b/resources/variants/modix_big60_0.8.inst.cfg deleted file mode 100644 index cda33bb931..0000000000 --- a/resources/variants/modix_big60_0.8.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.8 mm Nozzle -version = 4 -definition = modix_big60 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_big60_1.0.inst.cfg b/resources/variants/modix_big60_1.0.inst.cfg deleted file mode 100644 index 8a018bd3ef..0000000000 --- a/resources/variants/modix_big60_1.0.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.0 mm Nozzle -version = 4 -definition = modix_big60 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.0 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big60_1.2.inst.cfg b/resources/variants/modix_big60_1.2.inst.cfg deleted file mode 100644 index 04777de7b9..0000000000 --- a/resources/variants/modix_big60_1.2.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.2 mm Nozzle -version = 4 -definition = modix_big60 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.2 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big60_1.4.inst.cfg b/resources/variants/modix_big60_1.4.inst.cfg deleted file mode 100644 index f52ab11cb0..0000000000 --- a/resources/variants/modix_big60_1.4.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.4 mm Nozzle -version = 4 -definition = modix_big60 - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.4 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_0.4.inst.cfg b/resources/variants/modix_bigmeter_0.4.inst.cfg deleted file mode 100644 index fd702debe3..0000000000 --- a/resources/variants/modix_bigmeter_0.4.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.4 mm Nozzle -version = 4 -definition = modix_big_meter - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_0.6.inst.cfg b/resources/variants/modix_bigmeter_0.6.inst.cfg deleted file mode 100644 index 1b2e40f232..0000000000 --- a/resources/variants/modix_bigmeter_0.6.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.6 mm Nozzle -version = 4 -definition = modix_big_meter - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_0.8.inst.cfg b/resources/variants/modix_bigmeter_0.8.inst.cfg deleted file mode 100644 index 2c9d8f162c..0000000000 --- a/resources/variants/modix_bigmeter_0.8.inst.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[general] -name = 0.8 mm Nozzle -version = 4 -definition = modix_big_meter - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_1.0.inst.cfg b/resources/variants/modix_bigmeter_1.0.inst.cfg deleted file mode 100644 index 4a366431cb..0000000000 --- a/resources/variants/modix_bigmeter_1.0.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.0 mm Nozzle -version = 4 -definition = modix_big_meter - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.0 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_1.2.inst.cfg b/resources/variants/modix_bigmeter_1.2.inst.cfg deleted file mode 100644 index 3a46ba6544..0000000000 --- a/resources/variants/modix_bigmeter_1.2.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.2 mm Nozzle -version = 4 -definition = modix_big_meter - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.2 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_bigmeter_1.4.inst.cfg b/resources/variants/modix_bigmeter_1.4.inst.cfg deleted file mode 100644 index 66ebad4340..0000000000 --- a/resources/variants/modix_bigmeter_1.4.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 1.4 mm Nozzle -version = 4 -definition = modix_big_meter - -[metadata] -setting_version = 19 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.4 -support_angle = 45 -infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_base_0.4.inst.cfg b/resources/variants/modix_v3_base_0.4.inst.cfg similarity index 70% rename from resources/variants/modix_base_0.4.inst.cfg rename to resources/variants/modix_v3_base_0.4.inst.cfg index d580b66cb8..24d764b735 100644 --- a/resources/variants/modix_base_0.4.inst.cfg +++ b/resources/variants/modix_v3_base_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4 mm Nozzle version = 4 -definition = modix_base +definition = modix_v3_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120X_0.6.inst.cfg b/resources/variants/modix_v3_base_0.6.inst.cfg similarity index 70% rename from resources/variants/modix_big120X_0.6.inst.cfg rename to resources/variants/modix_v3_base_0.6.inst.cfg index 545fa4b9f6..960d7e3f81 100644 --- a/resources/variants/modix_big120X_0.6.inst.cfg +++ b/resources/variants/modix_v3_base_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6 mm Nozzle version = 4 -definition = modix_big120X +definition = modix_v3_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120X_0.8.inst.cfg b/resources/variants/modix_v3_base_0.8.inst.cfg similarity index 70% rename from resources/variants/modix_big120X_0.8.inst.cfg rename to resources/variants/modix_v3_base_0.8.inst.cfg index facdfe3764..09e30c23aa 100644 --- a/resources/variants/modix_big120X_0.8.inst.cfg +++ b/resources/variants/modix_v3_base_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8 mm Nozzle version = 4 -definition = modix_big120X +definition = modix_v3_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120Z_1.0.inst.cfg b/resources/variants/modix_v3_base_1.0.inst.cfg similarity index 77% rename from resources/variants/modix_big120Z_1.0.inst.cfg rename to resources/variants/modix_v3_base_1.0.inst.cfg index 224dc05a2a..ab34005538 100644 --- a/resources/variants/modix_big120Z_1.0.inst.cfg +++ b/resources/variants/modix_v3_base_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0 mm Nozzle version = 4 -definition = modix_big120Z +definition = modix_v3_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big40_1.2.inst.cfg b/resources/variants/modix_v3_base_1.2.inst.cfg similarity index 77% rename from resources/variants/modix_big40_1.2.inst.cfg rename to resources/variants/modix_v3_base_1.2.inst.cfg index 73fa553ca1..34e8751c48 100644 --- a/resources/variants/modix_big40_1.2.inst.cfg +++ b/resources/variants/modix_v3_base_1.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.2 mm Nozzle version = 4 -definition = modix_big40 +definition = modix_v3_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120X_1.4.inst.cfg b/resources/variants/modix_v3_base_1.4.inst.cfg similarity index 77% rename from resources/variants/modix_big120X_1.4.inst.cfg rename to resources/variants/modix_v3_base_1.4.inst.cfg index 7f71e23a38..bf9aac40b1 100644 --- a/resources/variants/modix_big120X_1.4.inst.cfg +++ b/resources/variants/modix_v3_base_1.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.4 mm Nozzle version = 4 -definition = modix_big120X +definition = modix_v3_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_v3_big120X_0.4.inst.cfg b/resources/variants/modix_v3_big120X_0.4.inst.cfg new file mode 100644 index 0000000000..2c04f609e4 --- /dev/null +++ b/resources/variants/modix_v3_big120X_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v3_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v3_big120X_0.6.inst.cfg b/resources/variants/modix_v3_big120X_0.6.inst.cfg new file mode 100644 index 0000000000..999c8bd234 --- /dev/null +++ b/resources/variants/modix_v3_big120X_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v3_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v3_big120X_0.8.inst.cfg b/resources/variants/modix_v3_big120X_0.8.inst.cfg new file mode 100644 index 0000000000..245e2ef1c6 --- /dev/null +++ b/resources/variants/modix_v3_big120X_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v3_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v3_big120X_1.0.inst.cfg b/resources/variants/modix_v3_big120X_1.0.inst.cfg new file mode 100644 index 0000000000..4960a8580f --- /dev/null +++ b/resources/variants/modix_v3_big120X_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v3_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big120X_1.2.inst.cfg b/resources/variants/modix_v3_big120X_1.2.inst.cfg new file mode 100644 index 0000000000..27ab9e4edf --- /dev/null +++ b/resources/variants/modix_v3_big120X_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v3_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big120X_1.4.inst.cfg b/resources/variants/modix_v3_big120X_1.4.inst.cfg new file mode 100644 index 0000000000..b092de2875 --- /dev/null +++ b/resources/variants/modix_v3_big120X_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v3_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big120Z_0.4.inst.cfg b/resources/variants/modix_v3_big120Z_0.4.inst.cfg new file mode 100644 index 0000000000..1f287f1b01 --- /dev/null +++ b/resources/variants/modix_v3_big120Z_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v3_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v3_big120Z_0.6.inst.cfg b/resources/variants/modix_v3_big120Z_0.6.inst.cfg new file mode 100644 index 0000000000..2eb8c7331e --- /dev/null +++ b/resources/variants/modix_v3_big120Z_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v3_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v3_big120Z_0.8.inst.cfg b/resources/variants/modix_v3_big120Z_0.8.inst.cfg new file mode 100644 index 0000000000..7b154e1cd5 --- /dev/null +++ b/resources/variants/modix_v3_big120Z_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v3_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v3_big120Z_1.0.inst.cfg b/resources/variants/modix_v3_big120Z_1.0.inst.cfg new file mode 100644 index 0000000000..3357e018d0 --- /dev/null +++ b/resources/variants/modix_v3_big120Z_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v3_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big120Z_1.2.inst.cfg b/resources/variants/modix_v3_big120Z_1.2.inst.cfg new file mode 100644 index 0000000000..b2c76d1067 --- /dev/null +++ b/resources/variants/modix_v3_big120Z_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v3_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big120Z_1.4.inst.cfg b/resources/variants/modix_v3_big120Z_1.4.inst.cfg new file mode 100644 index 0000000000..ec51d67102 --- /dev/null +++ b/resources/variants/modix_v3_big120Z_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v3_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big180X_0.4.inst.cfg b/resources/variants/modix_v3_big180X_0.4.inst.cfg new file mode 100644 index 0000000000..503677072c --- /dev/null +++ b/resources/variants/modix_v3_big180X_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v3_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v3_big180X_0.6.inst.cfg b/resources/variants/modix_v3_big180X_0.6.inst.cfg new file mode 100644 index 0000000000..918cb50149 --- /dev/null +++ b/resources/variants/modix_v3_big180X_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v3_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v3_big180X_0.8.inst.cfg b/resources/variants/modix_v3_big180X_0.8.inst.cfg new file mode 100644 index 0000000000..1172265fc9 --- /dev/null +++ b/resources/variants/modix_v3_big180X_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v3_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v3_big180X_1.0.inst.cfg b/resources/variants/modix_v3_big180X_1.0.inst.cfg new file mode 100644 index 0000000000..bb576510b8 --- /dev/null +++ b/resources/variants/modix_v3_big180X_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v3_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big180X_1.2.inst.cfg b/resources/variants/modix_v3_big180X_1.2.inst.cfg new file mode 100644 index 0000000000..cb66f8c1a8 --- /dev/null +++ b/resources/variants/modix_v3_big180X_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v3_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_big180X_1.4.inst.cfg b/resources/variants/modix_v3_big180X_1.4.inst.cfg new file mode 100644 index 0000000000..b631c01533 --- /dev/null +++ b/resources/variants/modix_v3_big180X_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v3_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big180X_0.4.inst.cfg b/resources/variants/modix_v3_big40_0.4.inst.cfg similarity index 70% rename from resources/variants/modix_big180X_0.4.inst.cfg rename to resources/variants/modix_v3_big40_0.4.inst.cfg index 1899ffa582..0d50cf96ed 100644 --- a/resources/variants/modix_big180X_0.4.inst.cfg +++ b/resources/variants/modix_v3_big40_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4 mm Nozzle version = 4 -definition = modix_big180X +definition = modix_v3_big40 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big180X_0.6.inst.cfg b/resources/variants/modix_v3_big40_0.6.inst.cfg similarity index 70% rename from resources/variants/modix_big180X_0.6.inst.cfg rename to resources/variants/modix_v3_big40_0.6.inst.cfg index 1563789ef7..05186710a1 100644 --- a/resources/variants/modix_big180X_0.6.inst.cfg +++ b/resources/variants/modix_v3_big40_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6 mm Nozzle version = 4 -definition = modix_big180X +definition = modix_v3_big40 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big180X_0.8.inst.cfg b/resources/variants/modix_v3_big40_0.8.inst.cfg similarity index 70% rename from resources/variants/modix_big180X_0.8.inst.cfg rename to resources/variants/modix_v3_big40_0.8.inst.cfg index 022a0ff1da..c36012e856 100644 --- a/resources/variants/modix_big180X_0.8.inst.cfg +++ b/resources/variants/modix_v3_big40_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8 mm Nozzle version = 4 -definition = modix_big180X +definition = modix_v3_big40 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big180X_1.0.inst.cfg b/resources/variants/modix_v3_big40_1.0.inst.cfg similarity index 76% rename from resources/variants/modix_big180X_1.0.inst.cfg rename to resources/variants/modix_v3_big40_1.0.inst.cfg index d084101eab..ea29359ae8 100644 --- a/resources/variants/modix_big180X_1.0.inst.cfg +++ b/resources/variants/modix_v3_big40_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0 mm Nozzle version = 4 -definition = modix_big180X +definition = modix_v3_big40 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120Z_1.2.inst.cfg b/resources/variants/modix_v3_big40_1.2.inst.cfg similarity index 76% rename from resources/variants/modix_big120Z_1.2.inst.cfg rename to resources/variants/modix_v3_big40_1.2.inst.cfg index 80cec8091d..3f676f536c 100644 --- a/resources/variants/modix_big120Z_1.2.inst.cfg +++ b/resources/variants/modix_v3_big40_1.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.2 mm Nozzle version = 4 -definition = modix_big120Z +definition = modix_v3_big40 [metadata] setting_version = 19 diff --git a/resources/variants/modix_base_1.4.inst.cfg b/resources/variants/modix_v3_big40_1.4.inst.cfg similarity index 76% rename from resources/variants/modix_base_1.4.inst.cfg rename to resources/variants/modix_v3_big40_1.4.inst.cfg index bf81b14bfb..c40ee6713e 100644 --- a/resources/variants/modix_base_1.4.inst.cfg +++ b/resources/variants/modix_v3_big40_1.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.4 mm Nozzle version = 4 -definition = modix_base +definition = modix_v3_big40 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120X_0.4.inst.cfg b/resources/variants/modix_v3_big60_0.4.inst.cfg similarity index 70% rename from resources/variants/modix_big120X_0.4.inst.cfg rename to resources/variants/modix_v3_big60_0.4.inst.cfg index f480e254e3..ca5566dd80 100644 --- a/resources/variants/modix_big120X_0.4.inst.cfg +++ b/resources/variants/modix_v3_big60_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4 mm Nozzle version = 4 -definition = modix_big120X +definition = modix_v3_big60 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big40_0.6.inst.cfg b/resources/variants/modix_v3_big60_0.6.inst.cfg similarity index 70% rename from resources/variants/modix_big40_0.6.inst.cfg rename to resources/variants/modix_v3_big60_0.6.inst.cfg index 6fa44b65a6..6978bb46f4 100644 --- a/resources/variants/modix_big40_0.6.inst.cfg +++ b/resources/variants/modix_v3_big60_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6 mm Nozzle version = 4 -definition = modix_big40 +definition = modix_v3_big60 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big40_0.8.inst.cfg b/resources/variants/modix_v3_big60_0.8.inst.cfg similarity index 70% rename from resources/variants/modix_big40_0.8.inst.cfg rename to resources/variants/modix_v3_big60_0.8.inst.cfg index b0362e3c22..0e06a15ee5 100644 --- a/resources/variants/modix_big40_0.8.inst.cfg +++ b/resources/variants/modix_v3_big60_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8 mm Nozzle version = 4 -definition = modix_big40 +definition = modix_v3_big60 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120X_1.0.inst.cfg b/resources/variants/modix_v3_big60_1.0.inst.cfg similarity index 76% rename from resources/variants/modix_big120X_1.0.inst.cfg rename to resources/variants/modix_v3_big60_1.0.inst.cfg index f51be7a17b..999e54d36d 100644 --- a/resources/variants/modix_big120X_1.0.inst.cfg +++ b/resources/variants/modix_v3_big60_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0 mm Nozzle version = 4 -definition = modix_big120X +definition = modix_v3_big60 [metadata] setting_version = 19 diff --git a/resources/variants/modix_big180X_1.2.inst.cfg b/resources/variants/modix_v3_big60_1.2.inst.cfg similarity index 76% rename from resources/variants/modix_big180X_1.2.inst.cfg rename to resources/variants/modix_v3_big60_1.2.inst.cfg index 91553b8784..e6658087a4 100644 --- a/resources/variants/modix_big180X_1.2.inst.cfg +++ b/resources/variants/modix_v3_big60_1.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.2 mm Nozzle version = 4 -definition = modix_big180X +definition = modix_v3_big60 [metadata] setting_version = 19 @@ -11,4 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big180X_1.4.inst.cfg b/resources/variants/modix_v3_big60_1.4.inst.cfg similarity index 76% rename from resources/variants/modix_big180X_1.4.inst.cfg rename to resources/variants/modix_v3_big60_1.4.inst.cfg index 1c4d8c5649..48513e8574 100644 --- a/resources/variants/modix_big180X_1.4.inst.cfg +++ b/resources/variants/modix_v3_big60_1.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.4 mm Nozzle version = 4 -definition = modix_big180X +definition = modix_v3_big60 [metadata] setting_version = 19 diff --git a/resources/variants/modix_v3_bigmeter_0.4.inst.cfg b/resources/variants/modix_v3_bigmeter_0.4.inst.cfg new file mode 100644 index 0000000000..7c497c2306 --- /dev/null +++ b/resources/variants/modix_v3_bigmeter_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v3_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v3_bigmeter_0.6.inst.cfg b/resources/variants/modix_v3_bigmeter_0.6.inst.cfg new file mode 100644 index 0000000000..6c6b695df7 --- /dev/null +++ b/resources/variants/modix_v3_bigmeter_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v3_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v3_bigmeter_0.8.inst.cfg b/resources/variants/modix_v3_bigmeter_0.8.inst.cfg new file mode 100644 index 0000000000..c725a73962 --- /dev/null +++ b/resources/variants/modix_v3_bigmeter_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v3_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v3_bigmeter_1.0.inst.cfg b/resources/variants/modix_v3_bigmeter_1.0.inst.cfg new file mode 100644 index 0000000000..24e786a342 --- /dev/null +++ b/resources/variants/modix_v3_bigmeter_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v3_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_bigmeter_1.2.inst.cfg b/resources/variants/modix_v3_bigmeter_1.2.inst.cfg new file mode 100644 index 0000000000..6db9b33269 --- /dev/null +++ b/resources/variants/modix_v3_bigmeter_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v3_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v3_bigmeter_1.4.inst.cfg b/resources/variants/modix_v3_bigmeter_1.4.inst.cfg new file mode 100644 index 0000000000..aabcbd9da6 --- /dev/null +++ b/resources/variants/modix_v3_bigmeter_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v3_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_big120Z_0.4.inst.cfg b/resources/variants/modix_v4_base_0.4.inst.cfg similarity index 70% rename from resources/variants/modix_big120Z_0.4.inst.cfg rename to resources/variants/modix_v4_base_0.4.inst.cfg index 0c832b34d8..8915a1fc53 100644 --- a/resources/variants/modix_big120Z_0.4.inst.cfg +++ b/resources/variants/modix_v4_base_0.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.4 mm Nozzle version = 4 -definition = modix_big120Z +definition = modix_v4_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120Z_0.6.inst.cfg b/resources/variants/modix_v4_base_0.6.inst.cfg similarity index 70% rename from resources/variants/modix_big120Z_0.6.inst.cfg rename to resources/variants/modix_v4_base_0.6.inst.cfg index 15ea4f45f5..5e76706b41 100644 --- a/resources/variants/modix_big120Z_0.6.inst.cfg +++ b/resources/variants/modix_v4_base_0.6.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.6 mm Nozzle version = 4 -definition = modix_big120Z +definition = modix_v4_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120Z_0.8.inst.cfg b/resources/variants/modix_v4_base_0.8.inst.cfg similarity index 70% rename from resources/variants/modix_big120Z_0.8.inst.cfg rename to resources/variants/modix_v4_base_0.8.inst.cfg index 084ca2e6d3..6e8d470138 100644 --- a/resources/variants/modix_big120Z_0.8.inst.cfg +++ b/resources/variants/modix_v4_base_0.8.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.8 mm Nozzle version = 4 -definition = modix_big120Z +definition = modix_v4_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big40_1.0.inst.cfg b/resources/variants/modix_v4_base_1.0.inst.cfg similarity index 77% rename from resources/variants/modix_big40_1.0.inst.cfg rename to resources/variants/modix_v4_base_1.0.inst.cfg index 76111c9404..16813de3b9 100644 --- a/resources/variants/modix_big40_1.0.inst.cfg +++ b/resources/variants/modix_v4_base_1.0.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.0 mm Nozzle version = 4 -definition = modix_big40 +definition = modix_v4_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120X_1.2.inst.cfg b/resources/variants/modix_v4_base_1.2.inst.cfg similarity index 77% rename from resources/variants/modix_big120X_1.2.inst.cfg rename to resources/variants/modix_v4_base_1.2.inst.cfg index 35a8a09dd4..483ff02fee 100644 --- a/resources/variants/modix_big120X_1.2.inst.cfg +++ b/resources/variants/modix_v4_base_1.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.2 mm Nozzle version = 4 -definition = modix_big120X +definition = modix_v4_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_big120Z_1.4.inst.cfg b/resources/variants/modix_v4_base_1.4.inst.cfg similarity index 77% rename from resources/variants/modix_big120Z_1.4.inst.cfg rename to resources/variants/modix_v4_base_1.4.inst.cfg index 6efaffca47..270ef2b057 100644 --- a/resources/variants/modix_big120Z_1.4.inst.cfg +++ b/resources/variants/modix_v4_base_1.4.inst.cfg @@ -1,7 +1,7 @@ [general] name = 1.4 mm Nozzle version = 4 -definition = modix_big120Z +definition = modix_v4_base [metadata] setting_version = 19 diff --git a/resources/variants/modix_v4_big120X_0.4.inst.cfg b/resources/variants/modix_v4_big120X_0.4.inst.cfg new file mode 100644 index 0000000000..41e2d0a1eb --- /dev/null +++ b/resources/variants/modix_v4_big120X_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v4_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v4_big120X_0.6.inst.cfg b/resources/variants/modix_v4_big120X_0.6.inst.cfg new file mode 100644 index 0000000000..af49c6ef7f --- /dev/null +++ b/resources/variants/modix_v4_big120X_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v4_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v4_big120X_0.8.inst.cfg b/resources/variants/modix_v4_big120X_0.8.inst.cfg new file mode 100644 index 0000000000..75992c094f --- /dev/null +++ b/resources/variants/modix_v4_big120X_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v4_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v4_big120X_1.0.inst.cfg b/resources/variants/modix_v4_big120X_1.0.inst.cfg new file mode 100644 index 0000000000..3812df2c8a --- /dev/null +++ b/resources/variants/modix_v4_big120X_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v4_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big120X_1.2.inst.cfg b/resources/variants/modix_v4_big120X_1.2.inst.cfg new file mode 100644 index 0000000000..8c58764f04 --- /dev/null +++ b/resources/variants/modix_v4_big120X_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v4_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big120X_1.4.inst.cfg b/resources/variants/modix_v4_big120X_1.4.inst.cfg new file mode 100644 index 0000000000..4bc8f9872d --- /dev/null +++ b/resources/variants/modix_v4_big120X_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v4_big120x + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big120Z_0.4.inst.cfg b/resources/variants/modix_v4_big120Z_0.4.inst.cfg new file mode 100644 index 0000000000..b7572c2e59 --- /dev/null +++ b/resources/variants/modix_v4_big120Z_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v4_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v4_big120Z_0.6.inst.cfg b/resources/variants/modix_v4_big120Z_0.6.inst.cfg new file mode 100644 index 0000000000..86be98b248 --- /dev/null +++ b/resources/variants/modix_v4_big120Z_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v4_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v4_big120Z_0.8.inst.cfg b/resources/variants/modix_v4_big120Z_0.8.inst.cfg new file mode 100644 index 0000000000..5e4a8f9b0b --- /dev/null +++ b/resources/variants/modix_v4_big120Z_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v4_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v4_big120Z_1.0.inst.cfg b/resources/variants/modix_v4_big120Z_1.0.inst.cfg new file mode 100644 index 0000000000..196c2943a7 --- /dev/null +++ b/resources/variants/modix_v4_big120Z_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v4_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big120Z_1.2.inst.cfg b/resources/variants/modix_v4_big120Z_1.2.inst.cfg new file mode 100644 index 0000000000..86fa72b814 --- /dev/null +++ b/resources/variants/modix_v4_big120Z_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v4_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big120Z_1.4.inst.cfg b/resources/variants/modix_v4_big120Z_1.4.inst.cfg new file mode 100644 index 0000000000..d49087f5b9 --- /dev/null +++ b/resources/variants/modix_v4_big120Z_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v4_big120Z + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big180X_0.4.inst.cfg b/resources/variants/modix_v4_big180X_0.4.inst.cfg new file mode 100644 index 0000000000..1794c94d4e --- /dev/null +++ b/resources/variants/modix_v4_big180X_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v4_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v4_big180X_0.6.inst.cfg b/resources/variants/modix_v4_big180X_0.6.inst.cfg new file mode 100644 index 0000000000..e8f4f5701e --- /dev/null +++ b/resources/variants/modix_v4_big180X_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v4_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v4_big180X_0.8.inst.cfg b/resources/variants/modix_v4_big180X_0.8.inst.cfg new file mode 100644 index 0000000000..4d03c804ad --- /dev/null +++ b/resources/variants/modix_v4_big180X_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v4_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v4_big180X_1.0.inst.cfg b/resources/variants/modix_v4_big180X_1.0.inst.cfg new file mode 100644 index 0000000000..010bb3c8b8 --- /dev/null +++ b/resources/variants/modix_v4_big180X_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v4_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big180X_1.2.inst.cfg b/resources/variants/modix_v4_big180X_1.2.inst.cfg new file mode 100644 index 0000000000..019ad5f2e9 --- /dev/null +++ b/resources/variants/modix_v4_big180X_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v4_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big180X_1.4.inst.cfg b/resources/variants/modix_v4_big180X_1.4.inst.cfg new file mode 100644 index 0000000000..1cbd2e9434 --- /dev/null +++ b/resources/variants/modix_v4_big180X_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v4_big180X + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big60_0.4.inst.cfg b/resources/variants/modix_v4_big60_0.4.inst.cfg new file mode 100644 index 0000000000..c6440601e6 --- /dev/null +++ b/resources/variants/modix_v4_big60_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v4_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v4_big60_0.6.inst.cfg b/resources/variants/modix_v4_big60_0.6.inst.cfg new file mode 100644 index 0000000000..458730eb95 --- /dev/null +++ b/resources/variants/modix_v4_big60_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v4_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v4_big60_0.8.inst.cfg b/resources/variants/modix_v4_big60_0.8.inst.cfg new file mode 100644 index 0000000000..0a25627582 --- /dev/null +++ b/resources/variants/modix_v4_big60_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v4_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v4_big60_1.0.inst.cfg b/resources/variants/modix_v4_big60_1.0.inst.cfg new file mode 100644 index 0000000000..6e6c6b417d --- /dev/null +++ b/resources/variants/modix_v4_big60_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v4_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big60_1.2.inst.cfg b/resources/variants/modix_v4_big60_1.2.inst.cfg new file mode 100644 index 0000000000..b76a53c221 --- /dev/null +++ b/resources/variants/modix_v4_big60_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v4_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_big60_1.4.inst.cfg b/resources/variants/modix_v4_big60_1.4.inst.cfg new file mode 100644 index 0000000000..3a814f7c77 --- /dev/null +++ b/resources/variants/modix_v4_big60_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v4_big60 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_bigmeter_0.4.inst.cfg b/resources/variants/modix_v4_bigmeter_0.4.inst.cfg new file mode 100644 index 0000000000..2ed48feb23 --- /dev/null +++ b/resources/variants/modix_v4_bigmeter_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = modix_v4_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 \ No newline at end of file diff --git a/resources/variants/modix_v4_bigmeter_0.6.inst.cfg b/resources/variants/modix_v4_bigmeter_0.6.inst.cfg new file mode 100644 index 0000000000..95f66f1116 --- /dev/null +++ b/resources/variants/modix_v4_bigmeter_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = modix_v4_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/modix_v4_bigmeter_0.8.inst.cfg b/resources/variants/modix_v4_bigmeter_0.8.inst.cfg new file mode 100644 index 0000000000..03f24267a3 --- /dev/null +++ b/resources/variants/modix_v4_bigmeter_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = modix_v4_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/modix_v4_bigmeter_1.0.inst.cfg b/resources/variants/modix_v4_bigmeter_1.0.inst.cfg new file mode 100644 index 0000000000..016a2bc9ef --- /dev/null +++ b/resources/variants/modix_v4_bigmeter_1.0.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.0 mm Nozzle +version = 4 +definition = modix_v4_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_bigmeter_1.2.inst.cfg b/resources/variants/modix_v4_bigmeter_1.2.inst.cfg new file mode 100644 index 0000000000..c3b2581f93 --- /dev/null +++ b/resources/variants/modix_v4_bigmeter_1.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.2 mm Nozzle +version = 4 +definition = modix_v4_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.2 +support_angle = 45 +infill_pattern = lines \ No newline at end of file diff --git a/resources/variants/modix_v4_bigmeter_1.4.inst.cfg b/resources/variants/modix_v4_bigmeter_1.4.inst.cfg new file mode 100644 index 0000000000..e74782dbbb --- /dev/null +++ b/resources/variants/modix_v4_bigmeter_1.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.4 mm Nozzle +version = 4 +definition = modix_v4_big_meter + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.4 +support_angle = 45 +infill_pattern = lines \ No newline at end of file From 116012740922ccd8a95521b82957eaa3dc3a06d2 Mon Sep 17 00:00:00 2001 From: victornpb <3372598+victornpb@users.noreply.github.com> Date: Sat, 19 Nov 2022 03:49:15 -0300 Subject: [PATCH 03/43] added UI fields --- .../scripts/FilamentChange.py | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index ff62e1949c..f61a9627e1 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -113,6 +113,38 @@ class FilamentChange(Script): }, "default_value": "RepRap (Marlin/Sprinter)", "enabled": "false" + }, + "enable_before_macro": + { + "label": "Enable macro Before filament change", + "description": "Use this to insert a custom G-code macro before the filament change happens", + "type": "bool", + "default_value": false + }, + "before_macro": + { + "label": "G-code Before", + "description": "Any custom G-code to run before the filament change happens, for example, M300 S1000 P10000 for a long beep.", + "unit": "", + "type": "str", + "default_value": "M300 S1000 P10000", + "enabled": "enable_before_macro" + }, + "enable_after_macro": + { + "label": "Enable macro After filament change", + "description": "Use this to insert a custom G-code macro after the filament change", + "type": "bool", + "default_value": false + }, + "after_macro": + { + "label": "G-code After", + "description": "Any custom G-code to run after the filament has been changed right before continuing the print, for example, you can add a sequence to purge filament and wipe the nozzle.", + "unit": "", + "type": "str", + "default_value": "M300 S440 P500", + "enabled": "enable_after_macro" } } }""" From ac16659829eeecccb8ce734bb353dcf4a4f630b6 Mon Sep 17 00:00:00 2001 From: victornpb <3372598+victornpb@users.noreply.github.com> Date: Sat, 19 Nov 2022 03:53:53 -0300 Subject: [PATCH 04/43] support custom gcode macro before and after filament change --- .../scripts/FilamentChange.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index f61a9627e1..415154da29 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -173,8 +173,18 @@ class FilamentChange(Script): y_pos = self.getSettingValueByKey("y_position") z_pos = self.getSettingValueByKey("z_position") firmware_config = self.getSettingValueByKey("firmware_config") + enable_before_macro = self.getSettingValueByKey("enable_before_macro") + before_macro = self.getSettingValueByKey("before_macro") + enable_after_macro = self.getSettingValueByKey("enable_after_macro") + after_macro = self.getSettingValueByKey("after_macro") - color_change = "M600" + + color_change = ";BEGIN FilamentChange plugin" + + if enable_before_macro: + color_change = color_change + "\n" + before_macro + + color_change = color_change + "\n" + "M600" if not firmware_config: if initial_retract is not None and initial_retract > 0.: @@ -195,7 +205,10 @@ class FilamentChange(Script): if z_pos is not None and z_pos > 0.: color_change = color_change + (" Z%.2f" % z_pos) - color_change = color_change + " ; Generated by FilamentChange plugin\n" + if enable_after_macro: + color_change = color_change + "\n" + after_macro + + color_change = color_change + "\n;END FilamentChange plugin\n" layer_targets = layer_nums.split(",") if len(layer_targets) > 0: From 4459ecb5d73aa1e34bee411a0552e71eb9ffa782 Mon Sep 17 00:00:00 2001 From: victornpb <3372598+victornpb@users.noreply.github.com> Date: Sat, 19 Nov 2022 03:56:20 -0300 Subject: [PATCH 05/43] Added "enable" checkbox consistent with changeAtZ.py. So you don't have to reconfigure it every time --- .../scripts/FilamentChange.py | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 415154da29..9155edf61f 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -24,20 +24,29 @@ class FilamentChange(Script): "version": 2, "settings": { + "enabled": + { + "label": "Enable", + "description": "Uncheck to temporarily disable this feature.", + "type": "bool", + "default_value": true + }, "layer_number": { "label": "Layer", "description": "At what layer should color change occur. This will be before the layer starts printing. Specify multiple color changes with a comma.", "unit": "", "type": "str", - "default_value": "1" + "default_value": "1", + "enabled": "enabled" }, "firmware_config": { "label": "Use Firmware Configuration", "description": "Use the settings in your firmware, or customise the parameters of the filament change here.", "type": "bool", - "default_value": false + "default_value": false, + "enabled": "enabled" }, "initial_retract": { @@ -46,7 +55,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 30.0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "later_retract": { @@ -55,7 +64,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 300.0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "x_position": { @@ -64,7 +73,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "y_position": { @@ -73,7 +82,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "z_position": { @@ -82,7 +91,8 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 0, - "minimum_value": 0 + "minimum_value": 0, + "enabled": "enabled" }, "retract_method": { @@ -92,7 +102,7 @@ class FilamentChange(Script): "options": {"U": "Marlin (M600 U)", "L": "Reprap (M600 L)"}, "default_value": "U", "value": "\\\"L\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"U\\\"", - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "machine_gcode_flavor": { @@ -119,7 +129,8 @@ class FilamentChange(Script): "label": "Enable macro Before filament change", "description": "Use this to insert a custom G-code macro before the filament change happens", "type": "bool", - "default_value": false + "default_value": false, + "enabled": "enabled" }, "before_macro": { @@ -128,14 +139,15 @@ class FilamentChange(Script): "unit": "", "type": "str", "default_value": "M300 S1000 P10000", - "enabled": "enable_before_macro" + "enabled": "enabled and enable_before_macro" }, "enable_after_macro": { "label": "Enable macro After filament change", "description": "Use this to insert a custom G-code macro after the filament change", "type": "bool", - "default_value": false + "default_value": false, + "enabled": "enabled" }, "after_macro": { @@ -144,7 +156,7 @@ class FilamentChange(Script): "unit": "", "type": "str", "default_value": "M300 S440 P500", - "enabled": "enable_after_macro" + "enabled": "enabled and enable_after_macro" } } }""" @@ -166,6 +178,7 @@ class FilamentChange(Script): :param data: A list of layers of g-code. :return: A similar list, with filament change commands inserted. """ + enabled = self.getSettingValueByKey("enabled") layer_nums = self.getSettingValueByKey("layer_number") initial_retract = self.getSettingValueByKey("initial_retract") later_retract = self.getSettingValueByKey("later_retract") @@ -178,6 +191,8 @@ class FilamentChange(Script): enable_after_macro = self.getSettingValueByKey("enable_after_macro") after_macro = self.getSettingValueByKey("after_macro") + if not enabled: + return data color_change = ";BEGIN FilamentChange plugin" From 337ce4caa1098ce6ef47baa9e40d75274ed40e1e Mon Sep 17 00:00:00 2001 From: victornpb <3372598+victornpb@users.noreply.github.com> Date: Sat, 19 Nov 2022 04:06:26 -0300 Subject: [PATCH 06/43] shortened label --- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 9155edf61f..fc09a267f9 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -126,7 +126,7 @@ class FilamentChange(Script): }, "enable_before_macro": { - "label": "Enable macro Before filament change", + "label": "Enable G-code Before", "description": "Use this to insert a custom G-code macro before the filament change happens", "type": "bool", "default_value": false, @@ -143,7 +143,7 @@ class FilamentChange(Script): }, "enable_after_macro": { - "label": "Enable macro After filament change", + "label": "Enable G-code After", "description": "Use this to insert a custom G-code macro after the filament change", "type": "bool", "default_value": false, From bfb2b044bb52670480548cc3269cdf8b55ff907a Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 15:43:05 +0100 Subject: [PATCH 07/43] nested popups will always try to take up the same vertical area as it's parent. If the popup is small than it's parent it won't go below or above the parent. If it is longer than the parent, the bottom will extend past the parent. CURA-9793 --- resources/qml/Menus/MaterialBrandMenu.qml | 44 ++++++++++++++++------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index e256e75904..35a48e4b2c 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -94,16 +94,27 @@ Cura.MenuItem x: parent.width - UM.Theme.getSize("default_lining").width y: { - // Checks if popup is more than halfway down the screen AND further than 400 down (this avoids popup going off the top of screen) - // If it is then the popup will push up instead of down - // This fixes the popups appearing bellow the bottom of the screen. + var popupHeight = materialTypesModel.material_types.count * UM.Theme.getSize("menu").height + var spaceToBottom = materialBrandMenu.parent.height - parent.y // Space from hovered item to bottom of list +// +// print(materialTypesModel) +// print(materialTypesModel.material_types) +// print(materialTypesModel.material_types.count) +// print("popupHeight: " + popupHeight) +// print("parentHeight: " + parentHeight) +// print("parent.y: " + parent.y) - if (materialBrandMenu.parent.height / 2 < parent.y && parent.y > 400) { - flipped = true - return -UM.Theme.getSize("default_lining").width - height + UM.Theme.getSize("menu").height + if (popupHeight < spaceToBottom) + { + return -UM.Theme.getSize("default_lining").width + } + else + { + // The popup is longer than the distance between the hovered item and the bottom of the item list. + // This pushes the popup upwards until the bottom lines up with the parent bottom. + // Only when popup is longer than the parent, the popup will flow out below the parent. + return -Math.max(parent.y - (materialBrandMenu.parent.height - popupHeight), 0) + (3 * UM.Theme.getSize("default_lining").height) } - flipped = false - return -UM.Theme.getSize("default_lining").width } padding: background.border.width @@ -243,11 +254,20 @@ Cura.MenuItem height: materialColorsList.height + padding * 2 x: parent.width y: { - // If flipped the popup should push up rather than down from the parent - if (brandMaterialBase.isFlipped) { - return -height + UM.Theme.getSize("menu").height + UM.Theme.getSize("default_lining").width + var popupHeight = model.colors.count * UM.Theme.getSize("menu").height + var spaceToBottom = materialTypesList.height - parent.y // Space from hovered item to bottom of list + + if (popupHeight < spaceToBottom) + { + return -UM.Theme.getSize("default_lining").width + } + else + { + // The popup is longer than the distance between the hovered item and the bottom of the item list. + // This pushes the popup upwards until the bottom lines up with the parent bottom. + // Only when popup is longer than the parent, the popup will flow out below the parent. + return -Math.max(parent.y - (materialTypesList.height - popupHeight), 0) } - return -UM.Theme.getSize("default_lining").width } property int itemHovered: 0 From 7185b898a3d821e6394e60890cbbcdab945a4b87 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 15:44:27 +0100 Subject: [PATCH 08/43] remove comments CURA-9793 --- resources/qml/Menus/MaterialBrandMenu.qml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 35a48e4b2c..f4f2fb5458 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -96,13 +96,6 @@ Cura.MenuItem y: { var popupHeight = materialTypesModel.material_types.count * UM.Theme.getSize("menu").height var spaceToBottom = materialBrandMenu.parent.height - parent.y // Space from hovered item to bottom of list -// -// print(materialTypesModel) -// print(materialTypesModel.material_types) -// print(materialTypesModel.material_types.count) -// print("popupHeight: " + popupHeight) -// print("parentHeight: " + parentHeight) -// print("parent.y: " + parent.y) if (popupHeight < spaceToBottom) { From 13dab34ad2814fde860c7f5ef4c9a88c3dc670aa Mon Sep 17 00:00:00 2001 From: Modix-Lazar Date: Mon, 5 Dec 2022 15:55:28 +0100 Subject: [PATCH 09/43] Removed pre-defined values from the files --- resources/definitions/modix_v3_base.def.json | 13 +------------ resources/definitions/modix_v3_big120X.def.json | 2 +- resources/definitions/modix_v3_big120Z.def.json | 2 +- resources/definitions/modix_v3_big180X.def.json | 2 +- resources/definitions/modix_v3_big40.def.json | 2 +- resources/definitions/modix_v3_big60.def.json | 2 +- resources/definitions/modix_v3_big_meter.def.json | 2 +- resources/definitions/modix_v4_base.def.json | 13 +------------ resources/definitions/modix_v4_big120X.def.json | 2 +- resources/definitions/modix_v4_big120Z.def.json | 2 +- resources/definitions/modix_v4_big180X.def.json | 2 +- resources/definitions/modix_v4_big60.def.json | 2 +- resources/definitions/modix_v4_big_meter.def.json | 2 +- resources/extruders/modix_v3_extruder_0.def.json | 1 - resources/extruders/modix_v3_extruder_1.def.json | 1 - resources/extruders/modix_v4_extruder_0.def.json | 1 - resources/extruders/modix_v4_extruder_1.def.json | 1 - 17 files changed, 13 insertions(+), 39 deletions(-) diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json index 9451c25655..4fa3866464 100644 --- a/resources/definitions/modix_v3_base.def.json +++ b/resources/definitions/modix_v3_base.def.json @@ -29,30 +29,20 @@ "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": 150.0 }, + "speed_travel": { "value": 110.0 }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1.05" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_corner": { "value": "z_seam_corner_weighted" }, @@ -78,7 +68,6 @@ "retraction_amount": { "value": 1 }, "retraction_count_max": { "value": 50 }, "retraction_extrusion_window": { "value": 1 }, - "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, diff --git a/resources/definitions/modix_v3_big120X.def.json b/resources/definitions/modix_v3_big120X.def.json index db3acb913a..29f4418cf7 100644 --- a/resources/definitions/modix_v3_big120X.def.json +++ b/resources/definitions/modix_v3_big120X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-120X" }, + "machine_name": { "default_value": "Modix BIG-120X V3" }, "machine_width": { "default_value": 1200 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 640 } diff --git a/resources/definitions/modix_v3_big120Z.def.json b/resources/definitions/modix_v3_big120Z.def.json index 2e6a9c26ce..08f3e87d2b 100644 --- a/resources/definitions/modix_v3_big120Z.def.json +++ b/resources/definitions/modix_v3_big120Z.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-120Z" }, + "machine_name": { "default_value": "Modix BIG-120Z V3" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 1200 } diff --git a/resources/definitions/modix_v3_big180X.def.json b/resources/definitions/modix_v3_big180X.def.json index 24b714ab28..b68902aa8c 100644 --- a/resources/definitions/modix_v3_big180X.def.json +++ b/resources/definitions/modix_v3_big180X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-180X" }, + "machine_name": { "default_value": "Modix BIG-180X V3" }, "machine_width": { "default_value": 1800 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 600 } diff --git a/resources/definitions/modix_v3_big40.def.json b/resources/definitions/modix_v3_big40.def.json index 1207dcc244..8202ae49b6 100644 --- a/resources/definitions/modix_v3_big40.def.json +++ b/resources/definitions/modix_v3_big40.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-40" }, + "machine_name": { "default_value": "Modix BIG-40 V3" }, "machine_width": { "default_value": 400 }, "machine_depth": { "default_value": 400 }, "machine_height": { "default_value": 800 } diff --git a/resources/definitions/modix_v3_big60.def.json b/resources/definitions/modix_v3_big60.def.json index 4e35f259f9..b5586429f8 100644 --- a/resources/definitions/modix_v3_big60.def.json +++ b/resources/definitions/modix_v3_big60.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-60" }, + "machine_name": { "default_value": "Modix BIG-60 V3" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 660 } diff --git a/resources/definitions/modix_v3_big_meter.def.json b/resources/definitions/modix_v3_big_meter.def.json index 3e1150f317..bc8b986b93 100644 --- a/resources/definitions/modix_v3_big_meter.def.json +++ b/resources/definitions/modix_v3_big_meter.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-Meter" }, + "machine_name": { "default_value": "Modix BIG-METER V3" }, "machine_width": { "default_value": 1000 }, "machine_depth": { "default_value": 1000 }, "machine_height": { "default_value": 1000 } diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json index 34a87d048d..6b2236942b 100644 --- a/resources/definitions/modix_v4_base.def.json +++ b/resources/definitions/modix_v4_base.def.json @@ -29,30 +29,20 @@ "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": 350.0 }, + "speed_travel": { "value": 250.0 }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1.05" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_corner": { "value": "z_seam_corner_weighted" }, @@ -78,7 +68,6 @@ "retraction_amount": { "value": 1 }, "retraction_count_max": { "value": 50 }, "retraction_extrusion_window": { "value": 1 }, - "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, diff --git a/resources/definitions/modix_v4_big120X.def.json b/resources/definitions/modix_v4_big120X.def.json index e691c30d7e..46e602c123 100644 --- a/resources/definitions/modix_v4_big120X.def.json +++ b/resources/definitions/modix_v4_big120X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-120X" }, + "machine_name": { "default_value": "Modix BIG-120X V4" }, "machine_width": { "default_value": 1200 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 640 } diff --git a/resources/definitions/modix_v4_big120Z.def.json b/resources/definitions/modix_v4_big120Z.def.json index 372d48ff78..3eb1ec08e4 100644 --- a/resources/definitions/modix_v4_big120Z.def.json +++ b/resources/definitions/modix_v4_big120Z.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-120Z" }, + "machine_name": { "default_value": "Modix BIG-120Z V4" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 1200 } diff --git a/resources/definitions/modix_v4_big180X.def.json b/resources/definitions/modix_v4_big180X.def.json index 43ce042dd5..f8bd7113d2 100644 --- a/resources/definitions/modix_v4_big180X.def.json +++ b/resources/definitions/modix_v4_big180X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-180X" }, + "machine_name": { "default_value": "Modix BIG-180X V4" }, "machine_width": { "default_value": 1800 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 600 } diff --git a/resources/definitions/modix_v4_big60.def.json b/resources/definitions/modix_v4_big60.def.json index b16486ca07..35327728e3 100644 --- a/resources/definitions/modix_v4_big60.def.json +++ b/resources/definitions/modix_v4_big60.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-60" }, + "machine_name": { "default_value": "Modix BIG-60 V4" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 660 } diff --git a/resources/definitions/modix_v4_big_meter.def.json b/resources/definitions/modix_v4_big_meter.def.json index 8adbef1f80..ff2a1fde19 100644 --- a/resources/definitions/modix_v4_big_meter.def.json +++ b/resources/definitions/modix_v4_big_meter.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-Meter" }, + "machine_name": { "default_value": "Modix BIG-METER V4" }, "machine_width": { "default_value": 1000 }, "machine_depth": { "default_value": 1000 }, "machine_height": { "default_value": 1000 } diff --git a/resources/extruders/modix_v3_extruder_0.def.json b/resources/extruders/modix_v3_extruder_0.def.json index 101d8217d7..d681db29b6 100644 --- a/resources/extruders/modix_v3_extruder_0.def.json +++ b/resources/extruders/modix_v3_extruder_0.def.json @@ -11,7 +11,6 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v3_extruder_1.def.json b/resources/extruders/modix_v3_extruder_1.def.json index b5fdef2233..4cd534f2f4 100644 --- a/resources/extruders/modix_v3_extruder_1.def.json +++ b/resources/extruders/modix_v3_extruder_1.def.json @@ -11,7 +11,6 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_0.def.json b/resources/extruders/modix_v4_extruder_0.def.json index 4cce57b57b..5aaf18d995 100644 --- a/resources/extruders/modix_v4_extruder_0.def.json +++ b/resources/extruders/modix_v4_extruder_0.def.json @@ -11,7 +11,6 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_1.def.json b/resources/extruders/modix_v4_extruder_1.def.json index 7e52173586..fc5426df94 100644 --- a/resources/extruders/modix_v4_extruder_1.def.json +++ b/resources/extruders/modix_v4_extruder_1.def.json @@ -11,7 +11,6 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file From d2ff62485d915d8b8bffd8f3a64288f6828eb4fe Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 5 Dec 2022 16:18:03 +0100 Subject: [PATCH 10/43] Fix popups not maxing height at top of parent CURA-9793 --- resources/qml/Menus/MaterialBrandMenu.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index f4f2fb5458..e096847016 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -106,7 +106,8 @@ Cura.MenuItem // The popup is longer than the distance between the hovered item and the bottom of the item list. // This pushes the popup upwards until the bottom lines up with the parent bottom. // Only when popup is longer than the parent, the popup will flow out below the parent. - return -Math.max(parent.y - (materialBrandMenu.parent.height - popupHeight), 0) + (3 * UM.Theme.getSize("default_lining").height) + var topOfParent = parent.y + (3 * UM.Theme.getSize("default_lining").height) + return -Math.min(parent.y - (materialBrandMenu.parent.height - popupHeight ), topOfParent) } } @@ -259,7 +260,8 @@ Cura.MenuItem // The popup is longer than the distance between the hovered item and the bottom of the item list. // This pushes the popup upwards until the bottom lines up with the parent bottom. // Only when popup is longer than the parent, the popup will flow out below the parent. - return -Math.max(parent.y - (materialTypesList.height - popupHeight), 0) + var topOfParent = parent.y + (3 * UM.Theme.getSize("default_lining").height) + return -Math.min(parent.y - (materialTypesList.height - popupHeight), parent.y) } } From e5baa6e2bf6f862ccceca324cc416777f073787c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 15:18:32 +0100 Subject: [PATCH 11/43] Update resources/qml/Menus/MaterialBrandMenu.qml Co-authored-by: Jelle Spijker --- resources/qml/Menus/MaterialBrandMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index e096847016..4afc197eba 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -99,7 +99,7 @@ Cura.MenuItem if (popupHeight < spaceToBottom) { - return -UM.Theme.getSize("default_lining").width + return -UM.Theme.getSize("default_lining").height } else { From 3dff780215d6488729f7c8ad7dd3e1993dc07ef5 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 15:36:55 +0100 Subject: [PATCH 12/43] Adjust location of popups so they align with their parent popup. CURA-9793 --- resources/qml/Menus/MaterialBrandMenu.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index e096847016..396a7c2123 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -106,7 +106,7 @@ Cura.MenuItem // The popup is longer than the distance between the hovered item and the bottom of the item list. // This pushes the popup upwards until the bottom lines up with the parent bottom. // Only when popup is longer than the parent, the popup will flow out below the parent. - var topOfParent = parent.y + (3 * UM.Theme.getSize("default_lining").height) + var topOfParent = parent.y + UM.Theme.getSize("narrow_margin").height return -Math.min(parent.y - (materialBrandMenu.parent.height - popupHeight ), topOfParent) } } @@ -260,8 +260,8 @@ Cura.MenuItem // The popup is longer than the distance between the hovered item and the bottom of the item list. // This pushes the popup upwards until the bottom lines up with the parent bottom. // Only when popup is longer than the parent, the popup will flow out below the parent. - var topOfParent = parent.y + (3 * UM.Theme.getSize("default_lining").height) - return -Math.min(parent.y - (materialTypesList.height - popupHeight), parent.y) + var topOfParent = parent.y + UM.Theme.getSize("default_lining").height + return -Math.min(parent.y - (materialTypesList.height - popupHeight - UM.Theme.getSize("default_lining").height), topOfParent) } } From 4f4d2431fa57b1473654bdde49575b5a333f3f94 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 8 Dec 2022 16:18:58 +0100 Subject: [PATCH 13/43] The third nested popup will now always try to stay withen the vertical space of the root materials popup. See CURA-9522 for diagrams and more information. CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 28 +++++++++++++++++++---- resources/qml/Menus/MaterialMenu.qml | 1 + 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 66cc337f9d..ef1d0b30a3 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -16,6 +16,7 @@ Cura.MenuItem id: materialBrandMenu overrideShowArrow: true + property var rootHeight property var materialTypesModel text: materialTypesModel.name @@ -36,6 +37,7 @@ Cura.MenuItem UM.Label { + id: brandLableText text: replaceText(materialBrandMenu.text) Layout.fillWidth: true Layout.fillHeight:true @@ -248,6 +250,8 @@ Cura.MenuItem height: materialColorsList.height + padding * 2 x: parent.width y: { + // This popup will always try to stay within the vertical space of the parent of MaterialBrandMenu + // If it is larger than the parent, it will expand downwards. var popupHeight = model.colors.count * UM.Theme.getSize("menu").height var spaceToBottom = materialTypesList.height - parent.y // Space from hovered item to bottom of list @@ -257,11 +261,25 @@ Cura.MenuItem } else { - // The popup is longer than the distance between the hovered item and the bottom of the item list. - // This pushes the popup upwards until the bottom lines up with the parent bottom. - // Only when popup is longer than the parent, the popup will flow out below the parent. - var topOfParent = parent.y + UM.Theme.getSize("default_lining").height - return -Math.min(parent.y - (materialTypesList.height - popupHeight - UM.Theme.getSize("default_lining").height), topOfParent) + var yAlignedWithTopOfRootPopup = - materialBrandMenu.y - UM.Theme.getSize("default_lining").height + + if (popupHeight > rootHeight && popupHeight > menuPopup.height) + { + // The popup is taller than the root material popup and the popup is taller than it's parent popup + // This means it should align with the top of the root popup + if (menuPopup.height < rootHeight) + { + //The root is larger than than the parent popup. Align with root top + return -materialBrandMenu.y - UM.Theme.getSize("default_lining").height + } + else + { + // The parent popup is larger than the root we only have to align to the top of the parent + return -brandMaterialBase.y - UM.Theme.getSize("default_lining").height + } + } + // The bottom of the popup is aligned with the bottom of the parent popup + return materialTypesList.height - parent.y - popupHeight - UM.Theme.getSize("default_lining").height } } diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index cee28cee6a..94092dc4a7 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -101,6 +101,7 @@ Cura.Menu delegate: Cura.MaterialBrandMenu { materialTypesModel: model + rootHeight: materialMenu.height } onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)} onObjectRemoved: function(index, object) { materialMenu.removeItem(index) } From 564fefa1c732dfd3aad8faffb44b545f62a1cfca Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 13 Dec 2022 11:46:06 +0100 Subject: [PATCH 14/43] Fix updating value with "," instead of "." in reccomended mode Fixed by correctly parsing dot in `SingleSettingTextField`. CURA-9793 --- resources/qml/Widgets/SingleSettingTextField.qml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 5bff7fdb5a..12d24d285d 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -87,15 +87,17 @@ UM.TextField function parseValueUpdateSetting() { - if (propertyProvider.properties.value === text || (parseFloat(propertyProvider.properties.value) === parseFloat(text))) + // User convenience. We use dots for decimal values + const modified_text = text.replace(",", "."); + if (propertyProvider.properties.value === modified_text || (parseFloat(propertyProvider.properties.value) === parseFloat(modified_text))) { // Don't set the property value from the control. It already has the same value return } - if (propertyProvider && text !== propertyProvider.properties.value) + if (propertyProvider && modified_text !== propertyProvider.properties.value) { - updateSetting(text); + updateSetting(modified_text); } } @@ -138,7 +140,7 @@ UM.TextField color: UM.Theme.getColor("setting_validation_warning_background") } }, - State + State { name: "disabled" when: !control.enabled From 83603ec8fab50440403f231c70dd0ddd64e110f9 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 13 Dec 2022 14:36:27 +0100 Subject: [PATCH 15/43] Center extruder icon in recommended settings CURA-9793 --- resources/qml/ExtruderIcon.qml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index c59521cdc3..93c5adf55a 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.11 @@ -12,7 +12,7 @@ Item property color materialColor property alias textColor: extruderNumberText.color property bool extruderEnabled: true - property var iconSize: UM.Theme.getSize("extruder_icon").width + property int iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" property alias font: extruderNumberText.font @@ -36,7 +36,6 @@ Item } UM.ColorImage { - id: mainIcon anchors.fill: parent width: iconSize height: iconSize @@ -48,12 +47,14 @@ Item UM.Label { id: extruderNumberText - anchors.centerIn: parent - text: index + 1 + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.right: parent.right + horizontalAlignment: Text.AlignHCenter + text: (index + 1).toString() font: UM.Theme.getFont("small_emphasis") width: contentWidth height: contentHeight - horizontalAlignment: Text.AlignHCenter } } } From 2c7bd7883a4b725ac6ae2429e55ef27c6e486da7 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 13 Dec 2022 17:05:51 +0100 Subject: [PATCH 16/43] Make recommended mode-window scrollable CURA-9793 --- .../PrintSetupSelectorContents.qml | 4 +++ .../Recommended/RecommendedPrintSetup.qml | 27 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 9d3da51356..52a22c6c76 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -67,6 +67,10 @@ Item top: parent.top } visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended + height: { + const height = base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height); + return Math.min(implicitHeight, height); + } function onModeChanged() { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index f78ae38dce..80e171bed4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -2,34 +2,41 @@ //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 +import QtQuick.Controls 2.15 import QtQuick.Layouts 1.1 import UM 1.6 as UM import Cura 1.6 as Cura import ".." -Item +ScrollView { id: recommendedPrintSetup - height: childrenRect.height + 2 * padding + implicitHeight: settingsColumn.height + 2 * padding property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1 - property real padding: UM.Theme.getSize("default_margin").width + + padding: UM.Theme.getSize("default_margin").width function onModeChanged() {} - Column - { - spacing: UM.Theme.getSize("default_margin").height - + ScrollBar.vertical: UM.ScrollBar { + id: scroll anchors { - left: parent.left - right: parent.right top: parent.top - margins: parent.padding + right: parent.right + bottom: parent.bottom } + } + + Column + { + id: settingsColumn + spacing: UM.Theme.getSize("default_margin").height + + width: recommendedPrintSetup.width - 2 * recommendedPrintSetup.padding - (scroll.visible ? scroll.width : 0) // TODO property real firstColumnWidth: Math.round(width / 3) From ffb59b28942f78b7d709a545f564e7b9bfb4d75f Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 14 Dec 2022 17:44:08 +0100 Subject: [PATCH 17/43] Move width, height properties to top of component CURA-9793 --- resources/qml/ExtruderIcon.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 93c5adf55a..3231d924ee 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -47,14 +47,14 @@ Item UM.Label { id: extruderNumberText + width: contentWidth + height: contentHeight anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.right: parent.right horizontalAlignment: Text.AlignHCenter text: (index + 1).toString() font: UM.Theme.getFont("small_emphasis") - width: contentWidth - height: contentHeight } } } From f6d18266e61ae08a29fd5e5003acfbf4a09fb660 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 15 Dec 2022 13:37:28 +0100 Subject: [PATCH 18/43] Give the default settings pannel a max-height CURA-9793 --- .../qml/PrintSetupSelector/PrintSetupSelectorContents.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 52a22c6c76..05407e6e0e 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -69,7 +69,8 @@ Item visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended height: { const height = base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height); - return Math.min(implicitHeight, height); + const maxHeight = UM.Preferences.getValue("view/settings_list_height"); + return Math.min(implicitHeight, height, maxHeight); } function onModeChanged() From ce191611f75770f079fcee7ba9d881a768251a53 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 16 Dec 2022 08:36:14 +0100 Subject: [PATCH 19/43] Only run on relevant changes --- .github/workflows/printer-linter-format.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index df4e049755..e5e1b5b1d6 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -3,7 +3,11 @@ name: printer-linter-format on: push: paths: - - 'resources/**' + - 'resources/definitions/**' + - 'resources/extruders/**' + - 'resources/intent/**' + - 'resources/quality/**' + - 'resources/variants/**' jobs: printer-linter-format: From 340e03327ec35c5d25f9b02202f996d0a22f7cca Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 16 Dec 2022 13:04:14 +0100 Subject: [PATCH 20/43] Use raw literal for paths Fixes Windows backwards backslash issue --- UltiMaker-Cura.spec.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 74e4fd098b..5eb01845c1 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -16,9 +16,9 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] # Add dynamic libs in the venv bin/Script Path. This is needed because we might copy some additional libs # e.q.: OpenSSL 1.1.1l in that directory with a separate: # `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin` -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.so*")]) -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dll")]) -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dylib")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.so*")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dll")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dylib")]) block_cipher = None From 51a6afb58f1e8322f1ab5d17557c3078e1801f8c Mon Sep 17 00:00:00 2001 From: Victor <3372598+victornpb@users.noreply.github.com> Date: Mon, 19 Dec 2022 14:42:19 -0300 Subject: [PATCH 21/43] Apply suggestions from code review Co-authored-by: Casper Lamboo --- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index fc09a267f9..ef85d5ae36 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -194,12 +194,12 @@ class FilamentChange(Script): if not enabled: return data - color_change = ";BEGIN FilamentChange plugin" + color_change = ";BEGIN FilamentChange plugin\n" if enable_before_macro: - color_change = color_change + "\n" + before_macro + color_change = color_change + before_macro + "\n" - color_change = color_change + "\n" + "M600" + color_change = color_change + "M600\n" if not firmware_config: if initial_retract is not None and initial_retract > 0.: @@ -221,9 +221,9 @@ class FilamentChange(Script): color_change = color_change + (" Z%.2f" % z_pos) if enable_after_macro: - color_change = color_change + "\n" + after_macro + color_change = color_change + after_macro + "\n" - color_change = color_change + "\n;END FilamentChange plugin\n" + color_change = color_change + ";END FilamentChange plugin\n" layer_targets = layer_nums.split(",") if len(layer_targets) > 0: From 7174861bba9bdbe502dab4fc3e2d19d5f39099f3 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 20 Dec 2022 15:26:46 +0100 Subject: [PATCH 22/43] Move popups back on screen after opening them. CURA-6867 --- resources/qml/Cura.qml | 3 ++ resources/qml/Menus/MaterialBrandMenu.qml | 63 ++++++----------------- 2 files changed, 20 insertions(+), 46 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 6e36587b23..503caf2384 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -17,6 +17,9 @@ UM.MainWindow { id: base + property var main_window_height: base.height + readonly property var mainWindow: base + // Cura application window title title: { diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index ef1d0b30a3..cf94eb5238 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -94,23 +94,17 @@ Cura.MenuItem property var flipped: false - x: parent.width - UM.Theme.getSize("default_lining").width - y: { + onOpened: + { var popupHeight = materialTypesModel.material_types.count * UM.Theme.getSize("menu").height - var spaceToBottom = materialBrandMenu.parent.height - parent.y // Space from hovered item to bottom of list + var parentGlobalY = parent.mapToItem(null, 0, 0).y + var overflowY = (parentGlobalY + popupHeight) - mainWindow.height + y = overflowY > 0 ? -overflowY : 0 - if (popupHeight < spaceToBottom) - { - return -UM.Theme.getSize("default_lining").height - } - else - { - // The popup is longer than the distance between the hovered item and the bottom of the item list. - // This pushes the popup upwards until the bottom lines up with the parent bottom. - // Only when popup is longer than the parent, the popup will flow out below the parent. - var topOfParent = parent.y + UM.Theme.getSize("narrow_margin").height - return -Math.min(parent.y - (materialBrandMenu.parent.height - popupHeight ), topOfParent) - } + var defaultX = parent.width - UM.Theme.getSize("default_lining").width + var parentGlobalX = parent.mapToItem(null, 0, 0).x + var overflowX = (parentGlobalX + defaultX + menuPopup.width) - mainWindow.width + x = overflowX > 0 ? overflowX : defaultX } padding: background.border.width @@ -248,39 +242,16 @@ Cura.MenuItem id: colorPopup width: materialColorsList.width + padding * 2 height: materialColorsList.height + padding * 2 - x: parent.width - y: { - // This popup will always try to stay within the vertical space of the parent of MaterialBrandMenu - // If it is larger than the parent, it will expand downwards. + onOpened: + { var popupHeight = model.colors.count * UM.Theme.getSize("menu").height - var spaceToBottom = materialTypesList.height - parent.y // Space from hovered item to bottom of list + var parentGlobalY = parent.mapToItem(null, 0, 0).y + var overflowY = (parentGlobalY + popupHeight) - mainWindow.height + y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height: - UM.Theme.getSize("default_lining").height - if (popupHeight < spaceToBottom) - { - return -UM.Theme.getSize("default_lining").width - } - else - { - var yAlignedWithTopOfRootPopup = - materialBrandMenu.y - UM.Theme.getSize("default_lining").height - - if (popupHeight > rootHeight && popupHeight > menuPopup.height) - { - // The popup is taller than the root material popup and the popup is taller than it's parent popup - // This means it should align with the top of the root popup - if (menuPopup.height < rootHeight) - { - //The root is larger than than the parent popup. Align with root top - return -materialBrandMenu.y - UM.Theme.getSize("default_lining").height - } - else - { - // The parent popup is larger than the root we only have to align to the top of the parent - return -brandMaterialBase.y - UM.Theme.getSize("default_lining").height - } - } - // The bottom of the popup is aligned with the bottom of the parent popup - return materialTypesList.height - parent.y - popupHeight - UM.Theme.getSize("default_lining").height - } + var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x + var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width + x = overflowX > 0 ? parent.width - overflowX : parent.width } property int itemHovered: 0 From e99387d067d55b4efd9da22fbb6315407457e25f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 20 Dec 2022 16:51:40 +0100 Subject: [PATCH 23/43] Point shortcut towards the correct executable Contributes to CURA-9157 --- packaging/msi/UltiMaker-Cura.wxs.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja index a4becd71f6..be8ddd41f7 100644 --- a/packaging/msi/UltiMaker-Cura.wxs.jinja +++ b/packaging/msi/UltiMaker-Cura.wxs.jinja @@ -90,7 +90,7 @@ Date: Tue, 20 Dec 2022 17:45:28 +0100 Subject: [PATCH 24/43] Add scrollview to material list CURA-6867 --- resources/qml/Menus/MaterialBrandMenu.qml | 145 +++++++++++++--------- 1 file changed, 85 insertions(+), 60 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index cf94eb5238..37d5ed81b5 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -244,6 +244,8 @@ Cura.MenuItem height: materialColorsList.height + padding * 2 onOpened: { + // This will be resolved before opening the popup if directly assigned to the properties + // This forces these values to update whenever a popup is opened var popupHeight = model.colors.count * UM.Theme.getSize("menu").height var parentGlobalY = parent.mapToItem(null, 0, 0).y var overflowY = (parentGlobalY + popupHeight) - mainWindow.height @@ -252,6 +254,10 @@ Cura.MenuItem var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width x = overflowX > 0 ? parent.width - overflowX : parent.width + + var popupHeight = model.colors.count * UM.Theme.getSize("menu").height + scrollView.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight + colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight } property int itemHovered: 0 @@ -263,79 +269,98 @@ Cura.MenuItem border.color: UM.Theme.getColor("lining") border.width: UM.Theme.getSize("default_lining").width } - - Column + ScrollView { - id: materialColorsList - property var brandColors: model.colors - spacing: 0 + id: scrollView + width: UM.Theme.getSize("menu").width + scrollbar.width + height: parent.height + clip: true - Repeater + ScrollBar.vertical: UM.ScrollBar { - model: parent.brandColors + id: scrollbar + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + } - delegate: Rectangle + Column + { + id: materialColorsList + property var brandColors: model.colors + width: UM.Theme.getSize("menu").width + height: parent.height + spacing: 0 + + Repeater { - height: UM.Theme.getSize("menu").height - width: UM.Theme.getSize("menu").width + model: parent.brandColors - color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") - - Item + delegate: Rectangle { - opacity: materialBrandMenu.enabled ? 1 : 0.5 - anchors.fill: parent + height: UM.Theme.getSize("menu").height + width: parent.width - //Checkmark, if the material is selected. - UM.ColorImage +// color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") + + Rectangle { - id: checkmark - visible: model.id === materialMenu.activeMaterialId - height: UM.Theme.getSize("default_arrow").height - width: height - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.verticalCenter: parent.verticalCenter - source: UM.Theme.getIcon("Check", "low") - color: UM.Theme.getColor("setting_control_text") + height: parent.height + width: parent.width + opacity: materialBrandMenu.enabled ? 1 : 0.5 + anchors.fill: parent + + //Checkmark, if the material is selected. + UM.ColorImage + { + id: checkmark + visible: model.id === materialMenu.activeMaterialId + height: UM.Theme.getSize("default_arrow").height + width: height + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.verticalCenter: parent.verticalCenter + source: UM.Theme.getIcon("Check", "low") + color: UM.Theme.getColor("setting_control_text") + } + + UM.Label + { + text: model.name + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + + elide: Label.ElideRight + wrapMode: Text.NoWrap + } } - UM.Label + MouseArea { - text: model.name - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width + id: materialColorButton + anchors.fill: parent - elide: Label.ElideRight - wrapMode: Text.NoWrap - } - } - - MouseArea - { - id: materialColorButton - anchors.fill: parent - - hoverEnabled: true - onClicked: - { - Cura.MachineManager.setMaterial(extruderIndex, model.container_node); - menuPopup.close(); - colorPopup.close(); - materialMenu.close(); - } - onEntered: - { - menuPopup.itemHovered += 1; - colorPopup.itemHovered += 1; - } - onExited: - { - menuPopup.itemHovered -= 1; - colorPopup.itemHovered -= 1; + hoverEnabled: true + onClicked: + { + Cura.MachineManager.setMaterial(extruderIndex, model.container_node); + menuPopup.close(); + colorPopup.close(); + materialMenu.close(); + } + onEntered: + { + menuPopup.itemHovered += 1; + colorPopup.itemHovered += 1; + } + onExited: + { + menuPopup.itemHovered -= 1; + colorPopup.itemHovered -= 1; + } } } } From e0a091e768fcb313093a9bbd676dd561eb1826a8 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 20 Dec 2022 18:06:40 +0100 Subject: [PATCH 25/43] Add scrollview to nested material list CURA-6867 --- resources/qml/Menus/MaterialBrandMenu.qml | 426 +++++++++++----------- 1 file changed, 223 insertions(+), 203 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 37d5ed81b5..5d55b59582 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -105,6 +105,9 @@ Cura.MenuItem var parentGlobalX = parent.mapToItem(null, 0, 0).x var overflowX = (parentGlobalX + defaultX + menuPopup.width) - mainWindow.width x = overflowX > 0 ? overflowX : defaultX + + scrollViewMaterialType.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight + menuPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight } padding: background.border.width @@ -128,238 +131,255 @@ Cura.MenuItem border.width: UM.Theme.getSize("default_lining").width } - Column + ScrollView { - id: materialTypesList - spacing: 0 + id: scrollViewMaterialType + width: UM.Theme.getSize("menu").width + scrollbar.width + height: parent.height + clip: true - property var brandMaterials: materialTypesModel.material_types - - Repeater + ScrollBar.vertical: UM.ScrollBar { - model: parent.brandMaterials + id: scrollbar + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + } - //Use a MouseArea and Rectangle, not a button, because the button grabs mouse events which makes the parent pop-up think it's no longer being hovered. - //With a custom MouseArea, we can prevent the events from being accepted. - delegate: Rectangle + Column + { + id: materialTypesList + width: UM.Theme.getSize("menu").width + height: parent.height + spacing: 0 + + property var brandMaterials: materialTypesModel.material_types + + Repeater { - id: brandMaterialBase - height: UM.Theme.getSize("menu").height - width: UM.Theme.getSize("menu").width + model: parent.brandMaterials - color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") - - property var isFlipped: menuPopup.flipped - - RowLayout + //Use a MouseArea and Rectangle, not a button, because the button grabs mouse events which makes the parent pop-up think it's no longer being hovered. + //With a custom MouseArea, we can prevent the events from being accepted. + delegate: Rectangle { - spacing: 0 - opacity: materialBrandMenu.enabled ? 1 : 0.5 - height: parent.height - width: parent.width + id: brandMaterialBase + height: UM.Theme.getSize("menu").height + width: UM.Theme.getSize("menu").width - Item + color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") + + property var isFlipped: menuPopup.flipped + + RowLayout { - // Spacer - width: UM.Theme.getSize("default_margin").width - } - - UM.Label - { - text: model.name - Layout.fillWidth: true - Layout.fillHeight: true - elide: Label.ElideRight - wrapMode: Text.NoWrap - } - - Item - { - Layout.fillWidth: true - } - - UM.ColorImage - { - height: UM.Theme.getSize("default_arrow").height - width: UM.Theme.getSize("default_arrow").width - color: UM.Theme.getColor("setting_control_text") - source: UM.Theme.getIcon("ChevronSingleRight") - } - - Item - { - // Right side margin - width: UM.Theme.getSize("default_margin").width - } - } - - MouseArea - { - id: materialTypeButton - anchors.fill: parent - - hoverEnabled: true - acceptedButtons: Qt.NoButton - - onEntered: - { - menuPopup.itemHovered += 1; - showSubTimer.restartTimer(); - } - onExited: - { - menuPopup.itemHovered -= 1; - hideSubTimer.restartTimer(); - } - } - Timer - { - id: showSubTimer - interval: 250 - function restartTimer() - { - restart(); - running = Qt.binding(function() { return materialTypeButton.containsMouse; }); - hideSubTimer.running = false; - } - onTriggered: colorPopup.open() - } - Timer - { - id: hideSubTimer - interval: 250 - function restartTimer() //Restart but re-evaluate the running property then. - { - restart(); - running = Qt.binding(function() { return !materialTypeButton.containsMouse && !colorPopup.itemHovered > 0; }); - showSubTimer.running = false; - } - onTriggered: colorPopup.close() - } - - Popup - { - id: colorPopup - width: materialColorsList.width + padding * 2 - height: materialColorsList.height + padding * 2 - onOpened: - { - // This will be resolved before opening the popup if directly assigned to the properties - // This forces these values to update whenever a popup is opened - var popupHeight = model.colors.count * UM.Theme.getSize("menu").height - var parentGlobalY = parent.mapToItem(null, 0, 0).y - var overflowY = (parentGlobalY + popupHeight) - mainWindow.height - y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height: - UM.Theme.getSize("default_lining").height - - var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x - var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width - x = overflowX > 0 ? parent.width - overflowX : parent.width - - var popupHeight = model.colors.count * UM.Theme.getSize("menu").height - scrollView.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight - colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight - } - - property int itemHovered: 0 - padding: background.border.width - - background: Rectangle - { - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("lining") - border.width: UM.Theme.getSize("default_lining").width - } - ScrollView - { - id: scrollView - width: UM.Theme.getSize("menu").width + scrollbar.width + spacing: 0 + opacity: materialBrandMenu.enabled ? 1 : 0.5 height: parent.height - clip: true + width: parent.width - ScrollBar.vertical: UM.ScrollBar + Item { - id: scrollbar - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom + // Spacer + width: UM.Theme.getSize("default_margin").width } - Column + UM.Label { - id: materialColorsList - property var brandColors: model.colors - width: UM.Theme.getSize("menu").width + text: model.name + Layout.fillWidth: true + Layout.fillHeight: true + elide: Label.ElideRight + wrapMode: Text.NoWrap + } + + Item + { + Layout.fillWidth: true + } + + UM.ColorImage + { + height: UM.Theme.getSize("default_arrow").height + width: UM.Theme.getSize("default_arrow").width + color: UM.Theme.getColor("setting_control_text") + source: UM.Theme.getIcon("ChevronSingleRight") + } + + Item + { + // Right side margin + width: UM.Theme.getSize("default_margin").width + } + } + + MouseArea + { + id: materialTypeButton + anchors.fill: parent + + hoverEnabled: true + acceptedButtons: Qt.NoButton + + onEntered: + { + menuPopup.itemHovered += 1; + showSubTimer.restartTimer(); + } + onExited: + { + menuPopup.itemHovered -= 1; + hideSubTimer.restartTimer(); + } + } + Timer + { + id: showSubTimer + interval: 250 + function restartTimer() + { + restart(); + running = Qt.binding(function() { return materialTypeButton.containsMouse; }); + hideSubTimer.running = false; + } + onTriggered: colorPopup.open() + } + Timer + { + id: hideSubTimer + interval: 250 + function restartTimer() //Restart but re-evaluate the running property then. + { + restart(); + running = Qt.binding(function() { return !materialTypeButton.containsMouse && !colorPopup.itemHovered > 0; }); + showSubTimer.running = false; + } + onTriggered: colorPopup.close() + } + + Popup + { + id: colorPopup + width: materialColorsList.width + padding * 2 + height: materialColorsList.height + padding * 2 + onOpened: + { + // This will be resolved before opening the popup if directly assigned to the properties + // This forces these values to update whenever a popup is opened + var popupHeight = model.colors.count * UM.Theme.getSize("menu").height + var parentGlobalY = parent.mapToItem(null, 0, 0).y + var overflowY = (parentGlobalY + popupHeight) - mainWindow.height + y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height: - UM.Theme.getSize("default_lining").height + + var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x + var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width + x = overflowX > 0 ? parent.width - overflowX : parent.width + + scrollView.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight + colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight + } + + property int itemHovered: 0 + padding: background.border.width + + background: Rectangle + { + color: UM.Theme.getColor("main_background") + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + } + ScrollView + { + id: scrollView + width: UM.Theme.getSize("menu").width + scrollbar.width height: parent.height - spacing: 0 + clip: true - Repeater + ScrollBar.vertical: UM.ScrollBar { - model: parent.brandColors + id: scrollbar + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + } - delegate: Rectangle + Column + { + id: materialColorsList + property var brandColors: model.colors + width: UM.Theme.getSize("menu").width + height: parent.height + spacing: 0 + + Repeater { - height: UM.Theme.getSize("menu").height - width: parent.width + model: parent.brandColors -// color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") - - Rectangle + delegate: Rectangle { - height: parent.height + height: UM.Theme.getSize("menu").height width: parent.width - opacity: materialBrandMenu.enabled ? 1 : 0.5 - anchors.fill: parent - //Checkmark, if the material is selected. - UM.ColorImage + color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") + + Rectangle { - id: checkmark - visible: model.id === materialMenu.activeMaterialId - height: UM.Theme.getSize("default_arrow").height - width: height - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.verticalCenter: parent.verticalCenter - source: UM.Theme.getIcon("Check", "low") - color: UM.Theme.getColor("setting_control_text") + height: parent.height + width: parent.width + opacity: materialBrandMenu.enabled ? 1 : 0.5 + anchors.fill: parent + + //Checkmark, if the material is selected. + UM.ColorImage + { + id: checkmark + visible: model.id === materialMenu.activeMaterialId + height: UM.Theme.getSize("default_arrow").height + width: height + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.verticalCenter: parent.verticalCenter + source: UM.Theme.getIcon("Check", "low") + color: UM.Theme.getColor("setting_control_text") + } + + UM.Label + { + text: model.name + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + + elide: Label.ElideRight + wrapMode: Text.NoWrap + } } - UM.Label + MouseArea { - text: model.name - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width + id: materialColorButton + anchors.fill: parent - elide: Label.ElideRight - wrapMode: Text.NoWrap - } - } - - MouseArea - { - id: materialColorButton - anchors.fill: parent - - hoverEnabled: true - onClicked: - { - Cura.MachineManager.setMaterial(extruderIndex, model.container_node); - menuPopup.close(); - colorPopup.close(); - materialMenu.close(); - } - onEntered: - { - menuPopup.itemHovered += 1; - colorPopup.itemHovered += 1; - } - onExited: - { - menuPopup.itemHovered -= 1; - colorPopup.itemHovered -= 1; + hoverEnabled: true + onClicked: + { + Cura.MachineManager.setMaterial(extruderIndex, model.container_node); + menuPopup.close(); + colorPopup.close(); + materialMenu.close(); + } + onEntered: + { + menuPopup.itemHovered += 1; + colorPopup.itemHovered += 1; + } + onExited: + { + menuPopup.itemHovered -= 1; + colorPopup.itemHovered -= 1; + } } } } From 9b60bf38adbb3e8552c6845eca5237ecc59ff401 Mon Sep 17 00:00:00 2001 From: Modix-Lazar Date: Wed, 21 Dec 2022 12:04:46 +0100 Subject: [PATCH 26/43] Updated the end-gcode The end gcode contained a typo (a rogue N was in front of the G10 P1 S0), and updated it to work a little bit better (now retracts, uses M106 S0 instead of M107, and moves out of the way quicker, and deselects the tool properly) --- resources/definitions/modix_v3_base.def.json | 4 ++-- resources/definitions/modix_v4_base.def.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json index 4fa3866464..c365194a11 100644 --- a/resources/definitions/modix_v3_base.def.json +++ b/resources/definitions/modix_v3_base.def.json @@ -19,8 +19,8 @@ "overrides": { "machine_name": { "default_value": "Modix Base Printer" }, "machine_start_gcode": { "default_value": "G28 ; home all axes"}, - "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0\n nG10 P1 S0 R0 ; turn off extruder1\n M107 ; turn off fan\n G91 ;relative positioning\n G1 Z2 F500 ; Move print head up\n G90 ; absolute positioning\n G28 XY ; home X and Y axis\n M84 ; disable motors" }, - "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, + "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nG10 P1 S0 R0 ; turn off extruder 1 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors"}, + "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, "material_diameter": { "default_value": 1.75 }, diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json index 6b2236942b..d5aacde936 100644 --- a/resources/definitions/modix_v4_base.def.json +++ b/resources/definitions/modix_v4_base.def.json @@ -19,7 +19,7 @@ "overrides": { "machine_name": { "default_value": "Modix Base Printer" }, "machine_start_gcode": { "default_value": "G28 ; home all axes"}, - "machine_end_gcode": { "default_value": "G4 P200; wait\nG10 P0 S0 R0 ; turn off extruder0\n nG10 P1 S0 R0 ; turn off extruder1\n M107 ; turn off fan\n G91 ;relative positioning\n G1 Z2 F500 ; Move print head up\n G90 ; absolute positioning\n G28 XY ; home X and Y axis\n M84 ; disable motors" }, + "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors"}, "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, "material_diameter": { "default_value": 1.75 }, From 78ca98f9bfd9f098cf607d74e76201da7a59a111 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Thu, 22 Dec 2022 12:31:00 +0000 Subject: [PATCH 27/43] Applied printer-linter format --- resources/definitions/modix_v3_base.def.json | 143 ++++++++---------- .../definitions/modix_v3_big120X.def.json | 18 +-- .../definitions/modix_v3_big120Z.def.json | 18 +-- .../definitions/modix_v3_big180X.def.json | 18 +-- resources/definitions/modix_v3_big40.def.json | 18 +-- resources/definitions/modix_v3_big60.def.json | 18 +-- .../definitions/modix_v3_big_meter.def.json | 18 +-- resources/definitions/modix_v4_base.def.json | 143 ++++++++---------- .../definitions/modix_v4_big120X.def.json | 18 +-- .../definitions/modix_v4_big120Z.def.json | 18 +-- .../definitions/modix_v4_big180X.def.json | 18 +-- resources/definitions/modix_v4_big60.def.json | 18 +-- .../definitions/modix_v4_big_meter.def.json | 18 +-- .../extruders/modix_v3_extruder_0.def.json | 25 +-- .../extruders/modix_v3_extruder_1.def.json | 23 +-- .../extruders/modix_v4_extruder_0.def.json | 25 +-- .../extruders/modix_v4_extruder_1.def.json | 23 +-- resources/variants/modix_v3_base_0.4.inst.cfg | 7 +- resources/variants/modix_v3_base_0.6.inst.cfg | 7 +- resources/variants/modix_v3_base_0.8.inst.cfg | 7 +- resources/variants/modix_v3_base_1.0.inst.cfg | 7 +- resources/variants/modix_v3_base_1.2.inst.cfg | 7 +- resources/variants/modix_v3_base_1.4.inst.cfg | 7 +- .../variants/modix_v3_big120X_0.4.inst.cfg | 7 +- .../variants/modix_v3_big120X_0.6.inst.cfg | 7 +- .../variants/modix_v3_big120X_0.8.inst.cfg | 7 +- .../variants/modix_v3_big120X_1.0.inst.cfg | 7 +- .../variants/modix_v3_big120X_1.2.inst.cfg | 7 +- .../variants/modix_v3_big120X_1.4.inst.cfg | 7 +- .../variants/modix_v3_big120Z_0.4.inst.cfg | 7 +- .../variants/modix_v3_big120Z_0.6.inst.cfg | 7 +- .../variants/modix_v3_big120Z_0.8.inst.cfg | 7 +- .../variants/modix_v3_big120Z_1.0.inst.cfg | 7 +- .../variants/modix_v3_big120Z_1.2.inst.cfg | 7 +- .../variants/modix_v3_big120Z_1.4.inst.cfg | 7 +- .../variants/modix_v3_big180X_0.4.inst.cfg | 7 +- .../variants/modix_v3_big180X_0.6.inst.cfg | 7 +- .../variants/modix_v3_big180X_0.8.inst.cfg | 7 +- .../variants/modix_v3_big180X_1.0.inst.cfg | 7 +- .../variants/modix_v3_big180X_1.2.inst.cfg | 7 +- .../variants/modix_v3_big180X_1.4.inst.cfg | 7 +- .../variants/modix_v3_big40_0.4.inst.cfg | 7 +- .../variants/modix_v3_big40_0.6.inst.cfg | 7 +- .../variants/modix_v3_big40_0.8.inst.cfg | 7 +- .../variants/modix_v3_big40_1.0.inst.cfg | 7 +- .../variants/modix_v3_big40_1.2.inst.cfg | 7 +- .../variants/modix_v3_big40_1.4.inst.cfg | 7 +- .../variants/modix_v3_big60_0.4.inst.cfg | 7 +- .../variants/modix_v3_big60_0.6.inst.cfg | 7 +- .../variants/modix_v3_big60_0.8.inst.cfg | 7 +- .../variants/modix_v3_big60_1.0.inst.cfg | 7 +- .../variants/modix_v3_big60_1.2.inst.cfg | 7 +- .../variants/modix_v3_big60_1.4.inst.cfg | 7 +- .../variants/modix_v3_bigmeter_0.4.inst.cfg | 7 +- .../variants/modix_v3_bigmeter_0.6.inst.cfg | 7 +- .../variants/modix_v3_bigmeter_0.8.inst.cfg | 7 +- .../variants/modix_v3_bigmeter_1.0.inst.cfg | 7 +- .../variants/modix_v3_bigmeter_1.2.inst.cfg | 7 +- .../variants/modix_v3_bigmeter_1.4.inst.cfg | 7 +- resources/variants/modix_v4_base_0.4.inst.cfg | 7 +- resources/variants/modix_v4_base_0.6.inst.cfg | 7 +- resources/variants/modix_v4_base_0.8.inst.cfg | 7 +- resources/variants/modix_v4_base_1.0.inst.cfg | 7 +- resources/variants/modix_v4_base_1.2.inst.cfg | 7 +- resources/variants/modix_v4_base_1.4.inst.cfg | 7 +- .../variants/modix_v4_big120X_0.4.inst.cfg | 7 +- .../variants/modix_v4_big120X_0.6.inst.cfg | 7 +- .../variants/modix_v4_big120X_0.8.inst.cfg | 7 +- .../variants/modix_v4_big120X_1.0.inst.cfg | 7 +- .../variants/modix_v4_big120X_1.2.inst.cfg | 7 +- .../variants/modix_v4_big120X_1.4.inst.cfg | 7 +- .../variants/modix_v4_big120Z_0.4.inst.cfg | 7 +- .../variants/modix_v4_big120Z_0.6.inst.cfg | 7 +- .../variants/modix_v4_big120Z_0.8.inst.cfg | 7 +- .../variants/modix_v4_big120Z_1.0.inst.cfg | 7 +- .../variants/modix_v4_big120Z_1.2.inst.cfg | 7 +- .../variants/modix_v4_big120Z_1.4.inst.cfg | 7 +- .../variants/modix_v4_big180X_0.4.inst.cfg | 7 +- .../variants/modix_v4_big180X_0.6.inst.cfg | 7 +- .../variants/modix_v4_big180X_0.8.inst.cfg | 7 +- .../variants/modix_v4_big180X_1.0.inst.cfg | 7 +- .../variants/modix_v4_big180X_1.2.inst.cfg | 7 +- .../variants/modix_v4_big180X_1.4.inst.cfg | 7 +- .../variants/modix_v4_big60_0.4.inst.cfg | 7 +- .../variants/modix_v4_big60_0.6.inst.cfg | 7 +- .../variants/modix_v4_big60_0.8.inst.cfg | 7 +- .../variants/modix_v4_big60_1.0.inst.cfg | 7 +- .../variants/modix_v4_big60_1.2.inst.cfg | 7 +- .../variants/modix_v4_big60_1.4.inst.cfg | 7 +- .../variants/modix_v4_bigmeter_0.4.inst.cfg | 7 +- .../variants/modix_v4_bigmeter_0.6.inst.cfg | 7 +- .../variants/modix_v4_bigmeter_0.8.inst.cfg | 7 +- .../variants/modix_v4_bigmeter_1.0.inst.cfg | 7 +- .../variants/modix_v4_bigmeter_1.2.inst.cfg | 7 +- .../variants/modix_v4_bigmeter_1.4.inst.cfg | 7 +- 95 files changed, 588 insertions(+), 538 deletions(-) diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json index c365194a11..52763c2e98 100644 --- a/resources/definitions/modix_v3_base.def.json +++ b/resources/definitions/modix_v3_base.def.json @@ -1,97 +1,88 @@ { + "version": 2, "name": "Modix Base Printer", - "version": 2, "inherits": "fdmprinter", - "metadata": { + "metadata": + { "author": "Modix", "manufacturer": "Modix", "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "modix_v3_extruder_0", - "1": "modix_v3_extruder_1" - }, - "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4 mm Nozzle" - - }, - "overrides": { + "machine_extruder_trains": + { + "0": "modix_v3_extruder_0", + "1": "modix_v3_extruder_1" + }, + "preferred_variant_name": "0.4 mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "90.0" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 2, 1)" }, + "line_width": { "value": "machine_nozzle_size * 1.05" }, + "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nG10 P1 S0 R0 ; turn off extruder 1 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-100, 30], + [-100, 65], + [30, -105], + [-31, -100] + ] + }, "machine_name": { "default_value": "Modix Base Printer" }, - "machine_start_gcode": { "default_value": "G28 ; home all axes"}, - "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nG10 P1 S0 R0 ; turn off extruder 1 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors"}, - "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, - + "machine_start_gcode": { "default_value": "G28 ; home all axes" }, "material_diameter": { "default_value": 1.75 }, - - "machine_head_with_fans_polygon": { "default_value": [[-100,30],[-100,65],[30,-105],[-31,-100]] }, - "gantry_height": {"value": "90.0"}, - - "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, - - "speed_wall_x": { "value": "speed_wall" }, - "speed_travel": { "value": 110.0 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 1 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 5 }, + "retraction_count_max": { "value": 50 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_hop": { "value": "layer_height*4" }, + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_prime_speed": { "value": 40 }, + "retraction_retract_speed": { "value": 40 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 3 }, "speed_layer_0": { "value": 20.0 }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, + "speed_travel": { "value": 110.0 }, + "speed_wall_x": { "value": "speed_wall" }, "speed_z_hop": { "value": 5 }, - - "line_width": { "value": "machine_nozzle_size * 1.05" }, - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - - "z_seam_corner": { "value": "z_seam_corner_weighted" }, - - "infill_sparse_density": { "value": "15" }, - "infill_pattern": { "value": "'cubic'" }, - "infill_before_walls": { "value": false }, - "infill_overlap": { "value": 30.0 }, - "skin_overlap": { "value": 10.0 }, - - "fill_outline_gaps": { "value": false }, - - "retraction_speed": { "default_value": 40 }, - "retraction_retract_speed": { "value": 40 }, - "retraction_prime_speed": { "value": 40 }, - - "retraction_hop_enabled": { "value": "support_enable" }, - "retraction_hop": { "value": "layer_height*4" }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, - "retraction_combing_max_distance": { "value": 5 }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 1 }, - "retraction_count_max": { "value": 50 }, - "retraction_extrusion_window": { "value": 1 }, - - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - - "adhesion_type": { "default_value": "skirt" }, - "skirt_brim_minimal_length": { "default_value": 200 }, - "skirt_gap": { "value": 5.0 }, - "skirt_line_count": { "value": 3 }, - "support_angle": { "value": 55 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" }, + "support_interface_density": { "value": 40 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, "support_use_towers": { "value": false }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.2 else layer_height * 2" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, - - "support_interface_enable": { "value": true }, - "support_interface_height": { "value": "layer_height * 3" }, - "support_interface_density": { "value": 40 }, - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } - + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "z_seam_corner_weighted" } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big120X.def.json b/resources/definitions/modix_v3_big120X.def.json index 29f4418cf7..9501ca96e1 100644 --- a/resources/definitions/modix_v3_big120X.def.json +++ b/resources/definitions/modix_v3_big120X.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V3 BIG-120X", "version": 2, + "name": "Modix V3 BIG-120X", "inherits": "modix_v3_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-120X V3" }, - "machine_width": { "default_value": 1200 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 640 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 640 }, + "machine_name": { "default_value": "Modix BIG-120X V3" }, + "machine_width": { "default_value": 1200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big120Z.def.json b/resources/definitions/modix_v3_big120Z.def.json index 08f3e87d2b..132ca0cd5f 100644 --- a/resources/definitions/modix_v3_big120Z.def.json +++ b/resources/definitions/modix_v3_big120Z.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V3 BIG-120Z", "version": 2, + "name": "Modix V3 BIG-120Z", "inherits": "modix_v3_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-120Z V3" }, - "machine_width": { "default_value": 600 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 1200 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 1200 }, + "machine_name": { "default_value": "Modix BIG-120Z V3" }, + "machine_width": { "default_value": 600 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big180X.def.json b/resources/definitions/modix_v3_big180X.def.json index b68902aa8c..18f3d0521f 100644 --- a/resources/definitions/modix_v3_big180X.def.json +++ b/resources/definitions/modix_v3_big180X.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V3 BIG-180X", "version": 2, + "name": "Modix V3 BIG-180X", "inherits": "modix_v3_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-180X V3" }, - "machine_width": { "default_value": 1800 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 600 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Modix BIG-180X V3" }, + "machine_width": { "default_value": 1800 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big40.def.json b/resources/definitions/modix_v3_big40.def.json index 8202ae49b6..8a44d919c2 100644 --- a/resources/definitions/modix_v3_big40.def.json +++ b/resources/definitions/modix_v3_big40.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V3 BIG-40", "version": 2, + "name": "Modix V3 BIG-40", "inherits": "modix_v3_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-40 V3" }, - "machine_width": { "default_value": 400 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 400 }, - "machine_height": { "default_value": 800 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 800 }, + "machine_name": { "default_value": "Modix BIG-40 V3" }, + "machine_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big60.def.json b/resources/definitions/modix_v3_big60.def.json index b5586429f8..3db8825e61 100644 --- a/resources/definitions/modix_v3_big60.def.json +++ b/resources/definitions/modix_v3_big60.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V3 BIG-60", "version": 2, + "name": "Modix V3 BIG-60", "inherits": "modix_v3_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-60 V3" }, - "machine_width": { "default_value": 600 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 660 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 660 }, + "machine_name": { "default_value": "Modix BIG-60 V3" }, + "machine_width": { "default_value": 600 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big_meter.def.json b/resources/definitions/modix_v3_big_meter.def.json index bc8b986b93..d6d2c968b9 100644 --- a/resources/definitions/modix_v3_big_meter.def.json +++ b/resources/definitions/modix_v3_big_meter.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V3 BIG-Meter", "version": 2, + "name": "Modix V3 BIG-Meter", "inherits": "modix_v3_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-METER V3" }, - "machine_width": { "default_value": 1000 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 1000 }, - "machine_height": { "default_value": 1000 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 1000 }, + "machine_name": { "default_value": "Modix BIG-METER V3" }, + "machine_width": { "default_value": 1000 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json index d5aacde936..7f02674355 100644 --- a/resources/definitions/modix_v4_base.def.json +++ b/resources/definitions/modix_v4_base.def.json @@ -1,97 +1,88 @@ { + "version": 2, "name": "Modix Base Printer", - "version": 2, "inherits": "fdmprinter", - "metadata": { + "metadata": + { "author": "Modix", "manufacturer": "Modix", "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "modix_v4_extruder_0", - "1": "modix_v4_extruder_1" - }, - "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4 mm Nozzle" - - }, - "overrides": { + "machine_extruder_trains": + { + "0": "modix_v4_extruder_0", + "1": "modix_v4_extruder_1" + }, + "preferred_variant_name": "0.4 mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "90.0" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 2, 1)" }, + "line_width": { "value": "machine_nozzle_size * 1.05" }, + "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-100, 30], + [-100, 65], + [30, -105], + [-31, -100] + ] + }, "machine_name": { "default_value": "Modix Base Printer" }, - "machine_start_gcode": { "default_value": "G28 ; home all axes"}, - "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors"}, - "machine_gcode_flavor": {"default_value": "RepRap (RepRap)"}, - + "machine_start_gcode": { "default_value": "G28 ; home all axes" }, "material_diameter": { "default_value": 1.75 }, - - "machine_head_with_fans_polygon": { "default_value": [[-100,30],[-100,65],[30,-105],[-31,-100]] }, - "gantry_height": {"value": "90.0"}, - - "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, - - "speed_wall_x": { "value": "speed_wall" }, - "speed_travel": { "value": 250.0 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 1 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 5 }, + "retraction_count_max": { "value": 50 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_hop": { "value": 2 }, + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_prime_speed": { "value": 40 }, + "retraction_retract_speed": { "value": 40 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 3 }, "speed_layer_0": { "value": 20.0 }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, + "speed_travel": { "value": 250.0 }, + "speed_wall_x": { "value": "speed_wall" }, "speed_z_hop": { "value": 5 }, - - "line_width": { "value": "machine_nozzle_size * 1.05" }, - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - - "z_seam_corner": { "value": "z_seam_corner_weighted" }, - - "infill_sparse_density": { "value": "15" }, - "infill_pattern": { "value": "'cubic'" }, - "infill_before_walls": { "value": false }, - "infill_overlap": { "value": 30.0 }, - "skin_overlap": { "value": 10.0 }, - - "fill_outline_gaps": { "value": false }, - - "retraction_speed": { "default_value": 40 }, - "retraction_retract_speed": { "value": 40 }, - "retraction_prime_speed": { "value": 40 }, - - "retraction_hop_enabled": { "value": "support_enable" }, - "retraction_hop": { "value": 2 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, - "retraction_combing_max_distance": { "value": 5 }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 1 }, - "retraction_count_max": { "value": 50 }, - "retraction_extrusion_window": { "value": 1 }, - - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - - "adhesion_type": { "default_value": "skirt" }, - "skirt_brim_minimal_length": { "default_value": 200 }, - "skirt_gap": { "value": 5.0 }, - "skirt_line_count": { "value": 3 }, - "support_angle": { "value": 55 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" }, + "support_interface_density": { "value": 40 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, "support_use_towers": { "value": false }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.2 else layer_height * 2" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, - - "support_interface_enable": { "value": true }, - "support_interface_height": { "value": "layer_height * 3" }, - "support_interface_density": { "value": 40 }, - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } - + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "z_seam_corner_weighted" } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big120X.def.json b/resources/definitions/modix_v4_big120X.def.json index 46e602c123..792d158ba4 100644 --- a/resources/definitions/modix_v4_big120X.def.json +++ b/resources/definitions/modix_v4_big120X.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V4 BIG-120X", "version": 2, + "name": "Modix V4 BIG-120X", "inherits": "modix_v4_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-120X V4" }, - "machine_width": { "default_value": 1200 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 640 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 640 }, + "machine_name": { "default_value": "Modix BIG-120X V4" }, + "machine_width": { "default_value": 1200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big120Z.def.json b/resources/definitions/modix_v4_big120Z.def.json index 3eb1ec08e4..fa568f0423 100644 --- a/resources/definitions/modix_v4_big120Z.def.json +++ b/resources/definitions/modix_v4_big120Z.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V4 BIG-120Z", "version": 2, + "name": "Modix V4 BIG-120Z", "inherits": "modix_v4_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-120Z V4" }, - "machine_width": { "default_value": 600 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 1200 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 1200 }, + "machine_name": { "default_value": "Modix BIG-120Z V4" }, + "machine_width": { "default_value": 600 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big180X.def.json b/resources/definitions/modix_v4_big180X.def.json index f8bd7113d2..52b8d7a1c4 100644 --- a/resources/definitions/modix_v4_big180X.def.json +++ b/resources/definitions/modix_v4_big180X.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V4 BIG-180X", "version": 2, + "name": "Modix V4 BIG-180X", "inherits": "modix_v4_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-180X V4" }, - "machine_width": { "default_value": 1800 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 600 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Modix BIG-180X V4" }, + "machine_width": { "default_value": 1800 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big60.def.json b/resources/definitions/modix_v4_big60.def.json index 35327728e3..6ff69ce1bf 100644 --- a/resources/definitions/modix_v4_big60.def.json +++ b/resources/definitions/modix_v4_big60.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V4 BIG-60", "version": 2, + "name": "Modix V4 BIG-60", "inherits": "modix_v4_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-60 V4" }, - "machine_width": { "default_value": 600 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 660 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 660 }, + "machine_name": { "default_value": "Modix BIG-60 V4" }, + "machine_width": { "default_value": 600 } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big_meter.def.json b/resources/definitions/modix_v4_big_meter.def.json index ff2a1fde19..849807c27f 100644 --- a/resources/definitions/modix_v4_big_meter.def.json +++ b/resources/definitions/modix_v4_big_meter.def.json @@ -1,15 +1,13 @@ { - "name": "Modix V4 BIG-Meter", "version": 2, + "name": "Modix V4 BIG-Meter", "inherits": "modix_v4_base", - "overrides": { - "machine_name": { "default_value": "Modix BIG-METER V4" }, - "machine_width": { "default_value": 1000 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 1000 }, - "machine_height": { "default_value": 1000 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 1000 }, + "machine_name": { "default_value": "Modix BIG-METER V4" }, + "machine_width": { "default_value": 1000 } } -} +} \ No newline at end of file diff --git a/resources/extruders/modix_v3_extruder_0.def.json b/resources/extruders/modix_v3_extruder_0.def.json index d681db29b6..7b983e06b2 100644 --- a/resources/extruders/modix_v3_extruder_0.def.json +++ b/resources/extruders/modix_v3_extruder_0.def.json @@ -1,16 +1,19 @@ { - "name": "Left Extruder", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "modix_v3_base", - "position": "0" - }, - "overrides": { - "extruder_nr": { + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v3_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" - }, + }, "material_diameter": { "default_value": 1.75 } - } + } } \ No newline at end of file diff --git a/resources/extruders/modix_v3_extruder_1.def.json b/resources/extruders/modix_v3_extruder_1.def.json index 4cd534f2f4..0d218e8168 100644 --- a/resources/extruders/modix_v3_extruder_1.def.json +++ b/resources/extruders/modix_v3_extruder_1.def.json @@ -1,16 +1,19 @@ { - "name": "Right Extruder", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "modix_v3_base", - "position": "1" - }, - "overrides": { - "extruder_nr": { + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v3_base", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "material_diameter": { "default_value": 1.75 } - } + } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_0.def.json b/resources/extruders/modix_v4_extruder_0.def.json index 5aaf18d995..bce44abe0f 100644 --- a/resources/extruders/modix_v4_extruder_0.def.json +++ b/resources/extruders/modix_v4_extruder_0.def.json @@ -1,16 +1,19 @@ { - "name": "Left Extruder", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "modix_v4_base", - "position": "0" - }, - "overrides": { - "extruder_nr": { + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v4_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" - }, + }, "material_diameter": { "default_value": 1.75 } - } + } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_1.def.json b/resources/extruders/modix_v4_extruder_1.def.json index fc5426df94..bae7499c45 100644 --- a/resources/extruders/modix_v4_extruder_1.def.json +++ b/resources/extruders/modix_v4_extruder_1.def.json @@ -1,16 +1,19 @@ { - "name": "Right Extruder", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "modix_v4_base", - "position": "1" - }, - "overrides": { - "extruder_nr": { + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v4_base", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "material_diameter": { "default_value": 1.75 } - } + } } \ No newline at end of file diff --git a/resources/variants/modix_v3_base_0.4.inst.cfg b/resources/variants/modix_v3_base_0.4.inst.cfg index 24d764b735..c3d64518ae 100644 --- a/resources/variants/modix_v3_base_0.4.inst.cfg +++ b/resources/variants/modix_v3_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_base name = 0.4 mm Nozzle version = 4 -definition = modix_v3_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_base_0.6.inst.cfg b/resources/variants/modix_v3_base_0.6.inst.cfg index 960d7e3f81..8d2cffa3e9 100644 --- a/resources/variants/modix_v3_base_0.6.inst.cfg +++ b/resources/variants/modix_v3_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_base name = 0.6 mm Nozzle version = 4 -definition = modix_v3_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_base_0.8.inst.cfg b/resources/variants/modix_v3_base_0.8.inst.cfg index 09e30c23aa..81b5130473 100644 --- a/resources/variants/modix_v3_base_0.8.inst.cfg +++ b/resources/variants/modix_v3_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_base name = 0.8 mm Nozzle version = 4 -definition = modix_v3_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_base_1.0.inst.cfg b/resources/variants/modix_v3_base_1.0.inst.cfg index ab34005538..1de772e569 100644 --- a/resources/variants/modix_v3_base_1.0.inst.cfg +++ b/resources/variants/modix_v3_base_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_base name = 1.0 mm Nozzle version = 4 -definition = modix_v3_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_base_1.2.inst.cfg b/resources/variants/modix_v3_base_1.2.inst.cfg index 34e8751c48..e443d2f939 100644 --- a/resources/variants/modix_v3_base_1.2.inst.cfg +++ b/resources/variants/modix_v3_base_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_base name = 1.2 mm Nozzle version = 4 -definition = modix_v3_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_base_1.4.inst.cfg b/resources/variants/modix_v3_base_1.4.inst.cfg index bf9aac40b1..a6ba9fc306 100644 --- a/resources/variants/modix_v3_base_1.4.inst.cfg +++ b/resources/variants/modix_v3_base_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_base name = 1.4 mm Nozzle version = 4 -definition = modix_v3_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big120X_0.4.inst.cfg b/resources/variants/modix_v3_big120X_0.4.inst.cfg index 2c04f609e4..f0106a2af4 100644 --- a/resources/variants/modix_v3_big120X_0.4.inst.cfg +++ b/resources/variants/modix_v3_big120X_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big120x name = 0.4 mm Nozzle version = 4 -definition = modix_v3_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_big120X_0.6.inst.cfg b/resources/variants/modix_v3_big120X_0.6.inst.cfg index 999c8bd234..5bd0b38b89 100644 --- a/resources/variants/modix_v3_big120X_0.6.inst.cfg +++ b/resources/variants/modix_v3_big120X_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big120x name = 0.6 mm Nozzle version = 4 -definition = modix_v3_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_big120X_0.8.inst.cfg b/resources/variants/modix_v3_big120X_0.8.inst.cfg index 245e2ef1c6..77374c5a37 100644 --- a/resources/variants/modix_v3_big120X_0.8.inst.cfg +++ b/resources/variants/modix_v3_big120X_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big120x name = 0.8 mm Nozzle version = 4 -definition = modix_v3_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_big120X_1.0.inst.cfg b/resources/variants/modix_v3_big120X_1.0.inst.cfg index 4960a8580f..ce1b67ed45 100644 --- a/resources/variants/modix_v3_big120X_1.0.inst.cfg +++ b/resources/variants/modix_v3_big120X_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big120x name = 1.0 mm Nozzle version = 4 -definition = modix_v3_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big120X_1.2.inst.cfg b/resources/variants/modix_v3_big120X_1.2.inst.cfg index 27ab9e4edf..0ef8207a03 100644 --- a/resources/variants/modix_v3_big120X_1.2.inst.cfg +++ b/resources/variants/modix_v3_big120X_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big120x name = 1.2 mm Nozzle version = 4 -definition = modix_v3_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big120X_1.4.inst.cfg b/resources/variants/modix_v3_big120X_1.4.inst.cfg index b092de2875..88b6f3a27f 100644 --- a/resources/variants/modix_v3_big120X_1.4.inst.cfg +++ b/resources/variants/modix_v3_big120X_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big120x name = 1.4 mm Nozzle version = 4 -definition = modix_v3_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big120Z_0.4.inst.cfg b/resources/variants/modix_v3_big120Z_0.4.inst.cfg index 1f287f1b01..767a2b847c 100644 --- a/resources/variants/modix_v3_big120Z_0.4.inst.cfg +++ b/resources/variants/modix_v3_big120Z_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big120Z name = 0.4 mm Nozzle version = 4 -definition = modix_v3_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_big120Z_0.6.inst.cfg b/resources/variants/modix_v3_big120Z_0.6.inst.cfg index 2eb8c7331e..36d16e134d 100644 --- a/resources/variants/modix_v3_big120Z_0.6.inst.cfg +++ b/resources/variants/modix_v3_big120Z_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big120Z name = 0.6 mm Nozzle version = 4 -definition = modix_v3_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_big120Z_0.8.inst.cfg b/resources/variants/modix_v3_big120Z_0.8.inst.cfg index 7b154e1cd5..cbcacf34db 100644 --- a/resources/variants/modix_v3_big120Z_0.8.inst.cfg +++ b/resources/variants/modix_v3_big120Z_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big120Z name = 0.8 mm Nozzle version = 4 -definition = modix_v3_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_big120Z_1.0.inst.cfg b/resources/variants/modix_v3_big120Z_1.0.inst.cfg index 3357e018d0..9bd5de9303 100644 --- a/resources/variants/modix_v3_big120Z_1.0.inst.cfg +++ b/resources/variants/modix_v3_big120Z_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big120Z name = 1.0 mm Nozzle version = 4 -definition = modix_v3_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big120Z_1.2.inst.cfg b/resources/variants/modix_v3_big120Z_1.2.inst.cfg index b2c76d1067..bafce85a76 100644 --- a/resources/variants/modix_v3_big120Z_1.2.inst.cfg +++ b/resources/variants/modix_v3_big120Z_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big120Z name = 1.2 mm Nozzle version = 4 -definition = modix_v3_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big120Z_1.4.inst.cfg b/resources/variants/modix_v3_big120Z_1.4.inst.cfg index ec51d67102..ac36bec80a 100644 --- a/resources/variants/modix_v3_big120Z_1.4.inst.cfg +++ b/resources/variants/modix_v3_big120Z_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big120Z name = 1.4 mm Nozzle version = 4 -definition = modix_v3_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big180X_0.4.inst.cfg b/resources/variants/modix_v3_big180X_0.4.inst.cfg index 503677072c..dd1b3cec3f 100644 --- a/resources/variants/modix_v3_big180X_0.4.inst.cfg +++ b/resources/variants/modix_v3_big180X_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big180X name = 0.4 mm Nozzle version = 4 -definition = modix_v3_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_big180X_0.6.inst.cfg b/resources/variants/modix_v3_big180X_0.6.inst.cfg index 918cb50149..32f5de45bb 100644 --- a/resources/variants/modix_v3_big180X_0.6.inst.cfg +++ b/resources/variants/modix_v3_big180X_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big180X name = 0.6 mm Nozzle version = 4 -definition = modix_v3_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_big180X_0.8.inst.cfg b/resources/variants/modix_v3_big180X_0.8.inst.cfg index 1172265fc9..39595cd641 100644 --- a/resources/variants/modix_v3_big180X_0.8.inst.cfg +++ b/resources/variants/modix_v3_big180X_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big180X name = 0.8 mm Nozzle version = 4 -definition = modix_v3_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_big180X_1.0.inst.cfg b/resources/variants/modix_v3_big180X_1.0.inst.cfg index bb576510b8..0e8e40f43e 100644 --- a/resources/variants/modix_v3_big180X_1.0.inst.cfg +++ b/resources/variants/modix_v3_big180X_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big180X name = 1.0 mm Nozzle version = 4 -definition = modix_v3_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big180X_1.2.inst.cfg b/resources/variants/modix_v3_big180X_1.2.inst.cfg index cb66f8c1a8..50595149f6 100644 --- a/resources/variants/modix_v3_big180X_1.2.inst.cfg +++ b/resources/variants/modix_v3_big180X_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big180X name = 1.2 mm Nozzle version = 4 -definition = modix_v3_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big180X_1.4.inst.cfg b/resources/variants/modix_v3_big180X_1.4.inst.cfg index b631c01533..3dae827b02 100644 --- a/resources/variants/modix_v3_big180X_1.4.inst.cfg +++ b/resources/variants/modix_v3_big180X_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big180X name = 1.4 mm Nozzle version = 4 -definition = modix_v3_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big40_0.4.inst.cfg b/resources/variants/modix_v3_big40_0.4.inst.cfg index 0d50cf96ed..a46f582ec4 100644 --- a/resources/variants/modix_v3_big40_0.4.inst.cfg +++ b/resources/variants/modix_v3_big40_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big40 name = 0.4 mm Nozzle version = 4 -definition = modix_v3_big40 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_big40_0.6.inst.cfg b/resources/variants/modix_v3_big40_0.6.inst.cfg index 05186710a1..ce758510cf 100644 --- a/resources/variants/modix_v3_big40_0.6.inst.cfg +++ b/resources/variants/modix_v3_big40_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big40 name = 0.6 mm Nozzle version = 4 -definition = modix_v3_big40 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_big40_0.8.inst.cfg b/resources/variants/modix_v3_big40_0.8.inst.cfg index c36012e856..31d8a6f980 100644 --- a/resources/variants/modix_v3_big40_0.8.inst.cfg +++ b/resources/variants/modix_v3_big40_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big40 name = 0.8 mm Nozzle version = 4 -definition = modix_v3_big40 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_big40_1.0.inst.cfg b/resources/variants/modix_v3_big40_1.0.inst.cfg index ea29359ae8..fb1499278a 100644 --- a/resources/variants/modix_v3_big40_1.0.inst.cfg +++ b/resources/variants/modix_v3_big40_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big40 name = 1.0 mm Nozzle version = 4 -definition = modix_v3_big40 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big40_1.2.inst.cfg b/resources/variants/modix_v3_big40_1.2.inst.cfg index 3f676f536c..30ff80e4a2 100644 --- a/resources/variants/modix_v3_big40_1.2.inst.cfg +++ b/resources/variants/modix_v3_big40_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big40 name = 1.2 mm Nozzle version = 4 -definition = modix_v3_big40 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big40_1.4.inst.cfg b/resources/variants/modix_v3_big40_1.4.inst.cfg index c40ee6713e..610bd97e2b 100644 --- a/resources/variants/modix_v3_big40_1.4.inst.cfg +++ b/resources/variants/modix_v3_big40_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big40 name = 1.4 mm Nozzle version = 4 -definition = modix_v3_big40 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big60_0.4.inst.cfg b/resources/variants/modix_v3_big60_0.4.inst.cfg index ca5566dd80..00aa2ca553 100644 --- a/resources/variants/modix_v3_big60_0.4.inst.cfg +++ b/resources/variants/modix_v3_big60_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big60 name = 0.4 mm Nozzle version = 4 -definition = modix_v3_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_big60_0.6.inst.cfg b/resources/variants/modix_v3_big60_0.6.inst.cfg index 6978bb46f4..b73d7a8fa6 100644 --- a/resources/variants/modix_v3_big60_0.6.inst.cfg +++ b/resources/variants/modix_v3_big60_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big60 name = 0.6 mm Nozzle version = 4 -definition = modix_v3_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_big60_0.8.inst.cfg b/resources/variants/modix_v3_big60_0.8.inst.cfg index 0e06a15ee5..2cf72ab654 100644 --- a/resources/variants/modix_v3_big60_0.8.inst.cfg +++ b/resources/variants/modix_v3_big60_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big60 name = 0.8 mm Nozzle version = 4 -definition = modix_v3_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_big60_1.0.inst.cfg b/resources/variants/modix_v3_big60_1.0.inst.cfg index 999e54d36d..015ebe249b 100644 --- a/resources/variants/modix_v3_big60_1.0.inst.cfg +++ b/resources/variants/modix_v3_big60_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big60 name = 1.0 mm Nozzle version = 4 -definition = modix_v3_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big60_1.2.inst.cfg b/resources/variants/modix_v3_big60_1.2.inst.cfg index e6658087a4..e6c5b153df 100644 --- a/resources/variants/modix_v3_big60_1.2.inst.cfg +++ b/resources/variants/modix_v3_big60_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big60 name = 1.2 mm Nozzle version = 4 -definition = modix_v3_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_big60_1.4.inst.cfg b/resources/variants/modix_v3_big60_1.4.inst.cfg index 48513e8574..87847c148a 100644 --- a/resources/variants/modix_v3_big60_1.4.inst.cfg +++ b/resources/variants/modix_v3_big60_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big60 name = 1.4 mm Nozzle version = 4 -definition = modix_v3_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_bigmeter_0.4.inst.cfg b/resources/variants/modix_v3_bigmeter_0.4.inst.cfg index 7c497c2306..9243e88bb5 100644 --- a/resources/variants/modix_v3_bigmeter_0.4.inst.cfg +++ b/resources/variants/modix_v3_bigmeter_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big_meter name = 0.4 mm Nozzle version = 4 -definition = modix_v3_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v3_bigmeter_0.6.inst.cfg b/resources/variants/modix_v3_bigmeter_0.6.inst.cfg index 6c6b695df7..a273e97a96 100644 --- a/resources/variants/modix_v3_bigmeter_0.6.inst.cfg +++ b/resources/variants/modix_v3_bigmeter_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big_meter name = 0.6 mm Nozzle version = 4 -definition = modix_v3_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v3_bigmeter_0.8.inst.cfg b/resources/variants/modix_v3_bigmeter_0.8.inst.cfg index c725a73962..a1e90ed4a6 100644 --- a/resources/variants/modix_v3_bigmeter_0.8.inst.cfg +++ b/resources/variants/modix_v3_bigmeter_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v3_big_meter name = 0.8 mm Nozzle version = 4 -definition = modix_v3_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v3_bigmeter_1.0.inst.cfg b/resources/variants/modix_v3_bigmeter_1.0.inst.cfg index 24e786a342..82b427b201 100644 --- a/resources/variants/modix_v3_bigmeter_1.0.inst.cfg +++ b/resources/variants/modix_v3_bigmeter_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big_meter name = 1.0 mm Nozzle version = 4 -definition = modix_v3_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_bigmeter_1.2.inst.cfg b/resources/variants/modix_v3_bigmeter_1.2.inst.cfg index 6db9b33269..a7cc386632 100644 --- a/resources/variants/modix_v3_bigmeter_1.2.inst.cfg +++ b/resources/variants/modix_v3_bigmeter_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big_meter name = 1.2 mm Nozzle version = 4 -definition = modix_v3_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v3_bigmeter_1.4.inst.cfg b/resources/variants/modix_v3_bigmeter_1.4.inst.cfg index aabcbd9da6..22d2cfaeb3 100644 --- a/resources/variants/modix_v3_bigmeter_1.4.inst.cfg +++ b/resources/variants/modix_v3_bigmeter_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v3_big_meter name = 1.4 mm Nozzle version = 4 -definition = modix_v3_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_base_0.4.inst.cfg b/resources/variants/modix_v4_base_0.4.inst.cfg index 8915a1fc53..26311b47e6 100644 --- a/resources/variants/modix_v4_base_0.4.inst.cfg +++ b/resources/variants/modix_v4_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_base name = 0.4 mm Nozzle version = 4 -definition = modix_v4_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v4_base_0.6.inst.cfg b/resources/variants/modix_v4_base_0.6.inst.cfg index 5e76706b41..8c27750903 100644 --- a/resources/variants/modix_v4_base_0.6.inst.cfg +++ b/resources/variants/modix_v4_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_base name = 0.6 mm Nozzle version = 4 -definition = modix_v4_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v4_base_0.8.inst.cfg b/resources/variants/modix_v4_base_0.8.inst.cfg index 6e8d470138..d6e64d55b0 100644 --- a/resources/variants/modix_v4_base_0.8.inst.cfg +++ b/resources/variants/modix_v4_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_base name = 0.8 mm Nozzle version = 4 -definition = modix_v4_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v4_base_1.0.inst.cfg b/resources/variants/modix_v4_base_1.0.inst.cfg index 16813de3b9..804142f9c4 100644 --- a/resources/variants/modix_v4_base_1.0.inst.cfg +++ b/resources/variants/modix_v4_base_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_base name = 1.0 mm Nozzle version = 4 -definition = modix_v4_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_base_1.2.inst.cfg b/resources/variants/modix_v4_base_1.2.inst.cfg index 483ff02fee..96fdaaa6e5 100644 --- a/resources/variants/modix_v4_base_1.2.inst.cfg +++ b/resources/variants/modix_v4_base_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_base name = 1.2 mm Nozzle version = 4 -definition = modix_v4_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_base_1.4.inst.cfg b/resources/variants/modix_v4_base_1.4.inst.cfg index 270ef2b057..2447145e74 100644 --- a/resources/variants/modix_v4_base_1.4.inst.cfg +++ b/resources/variants/modix_v4_base_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_base name = 1.4 mm Nozzle version = 4 -definition = modix_v4_base [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big120X_0.4.inst.cfg b/resources/variants/modix_v4_big120X_0.4.inst.cfg index 41e2d0a1eb..3b42a17b5b 100644 --- a/resources/variants/modix_v4_big120X_0.4.inst.cfg +++ b/resources/variants/modix_v4_big120X_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big120x name = 0.4 mm Nozzle version = 4 -definition = modix_v4_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v4_big120X_0.6.inst.cfg b/resources/variants/modix_v4_big120X_0.6.inst.cfg index af49c6ef7f..ad38973676 100644 --- a/resources/variants/modix_v4_big120X_0.6.inst.cfg +++ b/resources/variants/modix_v4_big120X_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big120x name = 0.6 mm Nozzle version = 4 -definition = modix_v4_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v4_big120X_0.8.inst.cfg b/resources/variants/modix_v4_big120X_0.8.inst.cfg index 75992c094f..9ba46481db 100644 --- a/resources/variants/modix_v4_big120X_0.8.inst.cfg +++ b/resources/variants/modix_v4_big120X_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big120x name = 0.8 mm Nozzle version = 4 -definition = modix_v4_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v4_big120X_1.0.inst.cfg b/resources/variants/modix_v4_big120X_1.0.inst.cfg index 3812df2c8a..1236595c6b 100644 --- a/resources/variants/modix_v4_big120X_1.0.inst.cfg +++ b/resources/variants/modix_v4_big120X_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big120x name = 1.0 mm Nozzle version = 4 -definition = modix_v4_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big120X_1.2.inst.cfg b/resources/variants/modix_v4_big120X_1.2.inst.cfg index 8c58764f04..e973474b57 100644 --- a/resources/variants/modix_v4_big120X_1.2.inst.cfg +++ b/resources/variants/modix_v4_big120X_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big120x name = 1.2 mm Nozzle version = 4 -definition = modix_v4_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big120X_1.4.inst.cfg b/resources/variants/modix_v4_big120X_1.4.inst.cfg index 4bc8f9872d..95d6d10b75 100644 --- a/resources/variants/modix_v4_big120X_1.4.inst.cfg +++ b/resources/variants/modix_v4_big120X_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big120x name = 1.4 mm Nozzle version = 4 -definition = modix_v4_big120x [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big120Z_0.4.inst.cfg b/resources/variants/modix_v4_big120Z_0.4.inst.cfg index b7572c2e59..90523aa600 100644 --- a/resources/variants/modix_v4_big120Z_0.4.inst.cfg +++ b/resources/variants/modix_v4_big120Z_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big120Z name = 0.4 mm Nozzle version = 4 -definition = modix_v4_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v4_big120Z_0.6.inst.cfg b/resources/variants/modix_v4_big120Z_0.6.inst.cfg index 86be98b248..2b205295cf 100644 --- a/resources/variants/modix_v4_big120Z_0.6.inst.cfg +++ b/resources/variants/modix_v4_big120Z_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big120Z name = 0.6 mm Nozzle version = 4 -definition = modix_v4_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v4_big120Z_0.8.inst.cfg b/resources/variants/modix_v4_big120Z_0.8.inst.cfg index 5e4a8f9b0b..bb9a916124 100644 --- a/resources/variants/modix_v4_big120Z_0.8.inst.cfg +++ b/resources/variants/modix_v4_big120Z_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big120Z name = 0.8 mm Nozzle version = 4 -definition = modix_v4_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v4_big120Z_1.0.inst.cfg b/resources/variants/modix_v4_big120Z_1.0.inst.cfg index 196c2943a7..cf4fe66ce0 100644 --- a/resources/variants/modix_v4_big120Z_1.0.inst.cfg +++ b/resources/variants/modix_v4_big120Z_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big120Z name = 1.0 mm Nozzle version = 4 -definition = modix_v4_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big120Z_1.2.inst.cfg b/resources/variants/modix_v4_big120Z_1.2.inst.cfg index 86fa72b814..19354e1716 100644 --- a/resources/variants/modix_v4_big120Z_1.2.inst.cfg +++ b/resources/variants/modix_v4_big120Z_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big120Z name = 1.2 mm Nozzle version = 4 -definition = modix_v4_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big120Z_1.4.inst.cfg b/resources/variants/modix_v4_big120Z_1.4.inst.cfg index d49087f5b9..7141146b3a 100644 --- a/resources/variants/modix_v4_big120Z_1.4.inst.cfg +++ b/resources/variants/modix_v4_big120Z_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big120Z name = 1.4 mm Nozzle version = 4 -definition = modix_v4_big120Z [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big180X_0.4.inst.cfg b/resources/variants/modix_v4_big180X_0.4.inst.cfg index 1794c94d4e..8fe2f953ee 100644 --- a/resources/variants/modix_v4_big180X_0.4.inst.cfg +++ b/resources/variants/modix_v4_big180X_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big180X name = 0.4 mm Nozzle version = 4 -definition = modix_v4_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v4_big180X_0.6.inst.cfg b/resources/variants/modix_v4_big180X_0.6.inst.cfg index e8f4f5701e..43b870a7d0 100644 --- a/resources/variants/modix_v4_big180X_0.6.inst.cfg +++ b/resources/variants/modix_v4_big180X_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big180X name = 0.6 mm Nozzle version = 4 -definition = modix_v4_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v4_big180X_0.8.inst.cfg b/resources/variants/modix_v4_big180X_0.8.inst.cfg index 4d03c804ad..0e115b685b 100644 --- a/resources/variants/modix_v4_big180X_0.8.inst.cfg +++ b/resources/variants/modix_v4_big180X_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big180X name = 0.8 mm Nozzle version = 4 -definition = modix_v4_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v4_big180X_1.0.inst.cfg b/resources/variants/modix_v4_big180X_1.0.inst.cfg index 010bb3c8b8..9446851bd5 100644 --- a/resources/variants/modix_v4_big180X_1.0.inst.cfg +++ b/resources/variants/modix_v4_big180X_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big180X name = 1.0 mm Nozzle version = 4 -definition = modix_v4_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big180X_1.2.inst.cfg b/resources/variants/modix_v4_big180X_1.2.inst.cfg index 019ad5f2e9..1bf1ae098a 100644 --- a/resources/variants/modix_v4_big180X_1.2.inst.cfg +++ b/resources/variants/modix_v4_big180X_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big180X name = 1.2 mm Nozzle version = 4 -definition = modix_v4_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big180X_1.4.inst.cfg b/resources/variants/modix_v4_big180X_1.4.inst.cfg index 1cbd2e9434..225a180590 100644 --- a/resources/variants/modix_v4_big180X_1.4.inst.cfg +++ b/resources/variants/modix_v4_big180X_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big180X name = 1.4 mm Nozzle version = 4 -definition = modix_v4_big180X [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big60_0.4.inst.cfg b/resources/variants/modix_v4_big60_0.4.inst.cfg index c6440601e6..95403b5bd5 100644 --- a/resources/variants/modix_v4_big60_0.4.inst.cfg +++ b/resources/variants/modix_v4_big60_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big60 name = 0.4 mm Nozzle version = 4 -definition = modix_v4_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v4_big60_0.6.inst.cfg b/resources/variants/modix_v4_big60_0.6.inst.cfg index 458730eb95..aad7e77c99 100644 --- a/resources/variants/modix_v4_big60_0.6.inst.cfg +++ b/resources/variants/modix_v4_big60_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big60 name = 0.6 mm Nozzle version = 4 -definition = modix_v4_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v4_big60_0.8.inst.cfg b/resources/variants/modix_v4_big60_0.8.inst.cfg index 0a25627582..85e77e1f53 100644 --- a/resources/variants/modix_v4_big60_0.8.inst.cfg +++ b/resources/variants/modix_v4_big60_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big60 name = 0.8 mm Nozzle version = 4 -definition = modix_v4_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v4_big60_1.0.inst.cfg b/resources/variants/modix_v4_big60_1.0.inst.cfg index 6e6c6b417d..90b463f276 100644 --- a/resources/variants/modix_v4_big60_1.0.inst.cfg +++ b/resources/variants/modix_v4_big60_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big60 name = 1.0 mm Nozzle version = 4 -definition = modix_v4_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big60_1.2.inst.cfg b/resources/variants/modix_v4_big60_1.2.inst.cfg index b76a53c221..c4eb13e57d 100644 --- a/resources/variants/modix_v4_big60_1.2.inst.cfg +++ b/resources/variants/modix_v4_big60_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big60 name = 1.2 mm Nozzle version = 4 -definition = modix_v4_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_big60_1.4.inst.cfg b/resources/variants/modix_v4_big60_1.4.inst.cfg index 3a814f7c77..468b858b0a 100644 --- a/resources/variants/modix_v4_big60_1.4.inst.cfg +++ b/resources/variants/modix_v4_big60_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big60 name = 1.4 mm Nozzle version = 4 -definition = modix_v4_big60 [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_bigmeter_0.4.inst.cfg b/resources/variants/modix_v4_bigmeter_0.4.inst.cfg index 2ed48feb23..69a45b9374 100644 --- a/resources/variants/modix_v4_bigmeter_0.4.inst.cfg +++ b/resources/variants/modix_v4_bigmeter_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big_meter name = 0.4 mm Nozzle version = 4 -definition = modix_v4_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix_v4_bigmeter_0.6.inst.cfg b/resources/variants/modix_v4_bigmeter_0.6.inst.cfg index 95f66f1116..38dc736a26 100644 --- a/resources/variants/modix_v4_bigmeter_0.6.inst.cfg +++ b/resources/variants/modix_v4_bigmeter_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big_meter name = 0.6 mm Nozzle version = 4 -definition = modix_v4_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix_v4_bigmeter_0.8.inst.cfg b/resources/variants/modix_v4_bigmeter_0.8.inst.cfg index 03f24267a3..fc57926c7b 100644 --- a/resources/variants/modix_v4_bigmeter_0.8.inst.cfg +++ b/resources/variants/modix_v4_bigmeter_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = modix_v4_big_meter name = 0.8 mm Nozzle version = 4 -definition = modix_v4_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix_v4_bigmeter_1.0.inst.cfg b/resources/variants/modix_v4_bigmeter_1.0.inst.cfg index 016a2bc9ef..10404efd72 100644 --- a/resources/variants/modix_v4_bigmeter_1.0.inst.cfg +++ b/resources/variants/modix_v4_bigmeter_1.0.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big_meter name = 1.0 mm Nozzle version = 4 -definition = modix_v4_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.0 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_bigmeter_1.2.inst.cfg b/resources/variants/modix_v4_bigmeter_1.2.inst.cfg index c3b2581f93..42b0d6a324 100644 --- a/resources/variants/modix_v4_bigmeter_1.2.inst.cfg +++ b/resources/variants/modix_v4_bigmeter_1.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big_meter name = 1.2 mm Nozzle version = 4 -definition = modix_v4_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.2 support_angle = 45 -infill_pattern = lines \ No newline at end of file + diff --git a/resources/variants/modix_v4_bigmeter_1.4.inst.cfg b/resources/variants/modix_v4_bigmeter_1.4.inst.cfg index e74782dbbb..a9844fb8a5 100644 --- a/resources/variants/modix_v4_bigmeter_1.4.inst.cfg +++ b/resources/variants/modix_v4_bigmeter_1.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = modix_v4_big_meter name = 1.4 mm Nozzle version = 4 -definition = modix_v4_big_meter [metadata] +hardware_type = nozzle setting_version = 19 type = variant -hardware_type = nozzle [values] +infill_pattern = lines machine_nozzle_size = 1.4 support_angle = 45 -infill_pattern = lines \ No newline at end of file + From 93a51b6da9a4fd06af91ff88c85580f73e8c4837 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 13:40:20 +0100 Subject: [PATCH 28/43] Remove unused property CURA-9522 --- resources/qml/Cura.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 503caf2384..cb570fce46 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -17,7 +17,6 @@ UM.MainWindow { id: base - property var main_window_height: base.height readonly property var mainWindow: base // Cura application window title From 15761b6c5981bba5b1030cb4a7e7441dfaf4a82b Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Fri, 23 Dec 2022 13:51:32 +0100 Subject: [PATCH 29/43] Code style CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 5d55b59582..f31df33425 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -16,7 +16,7 @@ Cura.MenuItem id: materialBrandMenu overrideShowArrow: true - property var rootHeight + property int rootHeight property var materialTypesModel text: materialTypesModel.name @@ -99,15 +99,15 @@ Cura.MenuItem var popupHeight = materialTypesModel.material_types.count * UM.Theme.getSize("menu").height var parentGlobalY = parent.mapToItem(null, 0, 0).y var overflowY = (parentGlobalY + popupHeight) - mainWindow.height - y = overflowY > 0 ? -overflowY : 0 + menuPopup.y = overflowY > 0 ? -overflowY : 0 var defaultX = parent.width - UM.Theme.getSize("default_lining").width var parentGlobalX = parent.mapToItem(null, 0, 0).x var overflowX = (parentGlobalX + defaultX + menuPopup.width) - mainWindow.width - x = overflowX > 0 ? overflowX : defaultX + menuPopup.x = overflowX > 0 ? overflowX : defaultX - scrollViewMaterialType.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight - menuPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight + scrollViewMaterialType.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight + menuPopup.height = popupHeight > mainWindow.height ? mainWindow.heigh : popupHeight } padding: background.border.width @@ -169,7 +169,7 @@ Cura.MenuItem color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") - property var isFlipped: menuPopup.flipped + property bool isFlipped: menuPopup.flipped RowLayout { @@ -206,7 +206,7 @@ Cura.MenuItem source: UM.Theme.getIcon("ChevronSingleRight") } - Item + Item { // Right side margin width: UM.Theme.getSize("default_margin").width @@ -269,14 +269,14 @@ Cura.MenuItem var popupHeight = model.colors.count * UM.Theme.getSize("menu").height var parentGlobalY = parent.mapToItem(null, 0, 0).y var overflowY = (parentGlobalY + popupHeight) - mainWindow.height - y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height: - UM.Theme.getSize("default_lining").height + colorPopup.y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height : -UM.Theme.getSize("default_lining").height var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width - x = overflowX > 0 ? parent.width - overflowX : parent.width + colorPopup.x = overflowX > 0 ? parent.width - overflowX : parent.width - scrollView.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight - colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height: popupHeight + scrollView.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight + colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight } property int itemHovered: 0 @@ -306,7 +306,7 @@ Cura.MenuItem Column { id: materialColorsList - property var brandColors: model.colors + property color brandColors: model.colors width: UM.Theme.getSize("menu").width height: parent.height spacing: 0 From 92e6d5007fe5d0873ff9520ba7d280a14d4692ff Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 14:21:12 +0100 Subject: [PATCH 30/43] Remove unused property CURA-9793 --- resources/qml/Menus/MaterialBrandMenu.qml | 1 - resources/qml/Menus/MaterialMenu.qml | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index f31df33425..9ae3ed4cab 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -16,7 +16,6 @@ Cura.MenuItem id: materialBrandMenu overrideShowArrow: true - property int rootHeight property var materialTypesModel text: materialTypesModel.name diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 94092dc4a7..cee28cee6a 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -101,7 +101,6 @@ Cura.Menu delegate: Cura.MaterialBrandMenu { materialTypesModel: model - rootHeight: materialMenu.height } onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)} onObjectRemoved: function(index, object) { materialMenu.removeItem(index) } From 5a8bf7f37bf285a5d29acb4515cdc065d0c6d492 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 16:11:06 +0100 Subject: [PATCH 31/43] Fix material colors not showing up CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 9ae3ed4cab..71d6434a8b 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -305,7 +305,7 @@ Cura.MenuItem Column { id: materialColorsList - property color brandColors: model.colors + property var brandColors: model.colors width: UM.Theme.getSize("menu").width height: parent.height spacing: 0 From 0ecfdd063dd38ab2bc7c697685ea79544c04de22 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 16:12:25 +0100 Subject: [PATCH 32/43] Show bottom border of material brands CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 71d6434a8b..6cf3c74cfb 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -166,7 +166,7 @@ Cura.MenuItem height: UM.Theme.getSize("menu").height width: UM.Theme.getSize("menu").width - color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") + color: materialTypeButton.containsMouse ? "transparent" : UM.Theme.getColor("background_1") property bool isFlipped: menuPopup.flipped @@ -319,7 +319,7 @@ Cura.MenuItem height: UM.Theme.getSize("menu").height width: parent.width - color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") + color: materialColorButton.containsMouse ? "transparent" : UM.Theme.getColor("background_1") Rectangle { From ab49dcceb5fa4282c44df12e27f54be94e6a7b49 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 16:16:19 +0100 Subject: [PATCH 33/43] Show bottom border of material brands CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 6cf3c74cfb..0820ec2f2d 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -166,7 +166,7 @@ Cura.MenuItem height: UM.Theme.getSize("menu").height width: UM.Theme.getSize("menu").width - color: materialTypeButton.containsMouse ? "transparent" : UM.Theme.getColor("background_1") + color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" property bool isFlipped: menuPopup.flipped @@ -319,7 +319,7 @@ Cura.MenuItem height: UM.Theme.getSize("menu").height width: parent.width - color: materialColorButton.containsMouse ? "transparent" : UM.Theme.getColor("background_1") + color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" Rectangle { From 20fdf22e35abc984d2fdd9824a5d14dee84a4a70 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 16:18:33 +0100 Subject: [PATCH 34/43] Show bottom border of material brands CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index 0820ec2f2d..b0d09eacae 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -321,7 +321,7 @@ Cura.MenuItem color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" - Rectangle + Item { height: parent.height width: parent.width From e490250d9d2c809c83f07551a044172e1dee02c4 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 23 Dec 2022 19:40:27 +0100 Subject: [PATCH 35/43] Clean up code Create separate re-usable component for `MaterialBrandSubMenu` CURA-9522 --- resources/qml/Cura.qml | 6 +- resources/qml/Menus/MaterialBrandMenu.qml | 426 ++++++++----------- resources/qml/Menus/MaterialBrandSubMenu.qml | 117 +++++ 3 files changed, 291 insertions(+), 258 deletions(-) create mode 100644 resources/qml/Menus/MaterialBrandSubMenu.qml diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index cb570fce46..669fd1041e 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -17,7 +17,11 @@ UM.MainWindow { id: base - readonly property var mainWindow: base + Item + { + id: mainWindow + anchors.fill: parent + } // Cura application window title title: diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index b0d09eacae..e514de04a4 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -85,35 +85,15 @@ Cura.MenuItem onTriggered: menuPopup.close() } - Popup + MaterialBrandSubMenu { id: menuPopup - width: materialTypesList.width + padding * 2 - height: materialTypesList.height + padding * 2 - property var flipped: false - - onOpened: - { - var popupHeight = materialTypesModel.material_types.count * UM.Theme.getSize("menu").height - var parentGlobalY = parent.mapToItem(null, 0, 0).y - var overflowY = (parentGlobalY + popupHeight) - mainWindow.height - menuPopup.y = overflowY > 0 ? -overflowY : 0 - - var defaultX = parent.width - UM.Theme.getSize("default_lining").width - var parentGlobalX = parent.mapToItem(null, 0, 0).x - var overflowX = (parentGlobalX + defaultX + menuPopup.width) - mainWindow.width - menuPopup.x = overflowX > 0 ? overflowX : defaultX - - scrollViewMaterialType.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight - menuPopup.height = popupHeight > mainWindow.height ? mainWindow.heigh : popupHeight - } - - padding: background.border.width // Nasty hack to ensure that we can keep track if the popup contains the mouse. // Since we also want a hover for the sub items (and these events are sent async) // We have to keep a count of itemHovered (instead of just a bool) property int itemHovered: 0 + MouseArea { id: submenuArea @@ -123,263 +103,195 @@ Cura.MenuItem onEntered: hideTimer.restartTimer() } - background: Rectangle + Column { - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("lining") - border.width: UM.Theme.getSize("default_lining").width - } + id: materialTypesList + width: UM.Theme.getSize("menu").width + height: childrenRect.height + spacing: 0 - ScrollView - { - id: scrollViewMaterialType - width: UM.Theme.getSize("menu").width + scrollbar.width - height: parent.height - clip: true + property var brandMaterials: materialTypesModel.material_types - ScrollBar.vertical: UM.ScrollBar + Repeater { - id: scrollbar - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - } + model: parent.brandMaterials - Column - { - id: materialTypesList - width: UM.Theme.getSize("menu").width - height: parent.height - spacing: 0 - - property var brandMaterials: materialTypesModel.material_types - - Repeater + //Use a MouseArea and Rectangle, not a button, because the button grabs mouse events which makes the parent pop-up think it's no longer being hovered. + //With a custom MouseArea, we can prevent the events from being accepted. + delegate: Rectangle { - model: parent.brandMaterials + id: brandMaterialBase + height: UM.Theme.getSize("menu").height + width: UM.Theme.getSize("menu").width - //Use a MouseArea and Rectangle, not a button, because the button grabs mouse events which makes the parent pop-up think it's no longer being hovered. - //With a custom MouseArea, we can prevent the events from being accepted. - delegate: Rectangle + color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" + + RowLayout { - id: brandMaterialBase - height: UM.Theme.getSize("menu").height - width: UM.Theme.getSize("menu").width + spacing: 0 + opacity: materialBrandMenu.enabled ? 1 : 0.5 + height: parent.height + width: parent.width - color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" - - property bool isFlipped: menuPopup.flipped - - RowLayout + Item { + // Spacer + width: UM.Theme.getSize("default_margin").width + } + + UM.Label + { + text: model.name + Layout.fillWidth: true + Layout.fillHeight: true + elide: Label.ElideRight + wrapMode: Text.NoWrap + } + + Item + { + Layout.fillWidth: true + } + + UM.ColorImage + { + height: UM.Theme.getSize("default_arrow").height + width: UM.Theme.getSize("default_arrow").width + color: UM.Theme.getColor("setting_control_text") + source: UM.Theme.getIcon("ChevronSingleRight") + } + + Item + { + // Right side margin + width: UM.Theme.getSize("default_margin").width + } + } + + MouseArea + { + id: materialTypeButton + anchors.fill: parent + + hoverEnabled: true + acceptedButtons: Qt.NoButton + + onEntered: + { + menuPopup.itemHovered += 1; + showSubTimer.restartTimer(); + } + onExited: + { + menuPopup.itemHovered -= 1; + hideSubTimer.restartTimer(); + } + } + Timer + { + id: showSubTimer + interval: 250 + function restartTimer() + { + restart(); + running = Qt.binding(function() { return materialTypeButton.containsMouse; }); + hideSubTimer.running = false; + } + onTriggered: colorPopup.open() + } + Timer + { + id: hideSubTimer + interval: 250 + function restartTimer() //Restart but re-evaluate the running property then. + { + restart(); + running = Qt.binding(function() { return !materialTypeButton.containsMouse && !colorPopup.itemHovered > 0; }); + showSubTimer.running = false; + } + onTriggered: colorPopup.close() + } + + MaterialBrandSubMenu + { + id: colorPopup + property int itemHovered: 0 + + Column + { + id: materialColorsList + property var brandColors: model.colors + width: UM.Theme.getSize("menu").width + height: childrenRect.height spacing: 0 - opacity: materialBrandMenu.enabled ? 1 : 0.5 - height: parent.height - width: parent.width - Item + Repeater { - // Spacer - width: UM.Theme.getSize("default_margin").width - } + model: parent.brandColors - UM.Label - { - text: model.name - Layout.fillWidth: true - Layout.fillHeight: true - elide: Label.ElideRight - wrapMode: Text.NoWrap - } - - Item - { - Layout.fillWidth: true - } - - UM.ColorImage - { - height: UM.Theme.getSize("default_arrow").height - width: UM.Theme.getSize("default_arrow").width - color: UM.Theme.getColor("setting_control_text") - source: UM.Theme.getIcon("ChevronSingleRight") - } - - Item - { - // Right side margin - width: UM.Theme.getSize("default_margin").width - } - } - - MouseArea - { - id: materialTypeButton - anchors.fill: parent - - hoverEnabled: true - acceptedButtons: Qt.NoButton - - onEntered: - { - menuPopup.itemHovered += 1; - showSubTimer.restartTimer(); - } - onExited: - { - menuPopup.itemHovered -= 1; - hideSubTimer.restartTimer(); - } - } - Timer - { - id: showSubTimer - interval: 250 - function restartTimer() - { - restart(); - running = Qt.binding(function() { return materialTypeButton.containsMouse; }); - hideSubTimer.running = false; - } - onTriggered: colorPopup.open() - } - Timer - { - id: hideSubTimer - interval: 250 - function restartTimer() //Restart but re-evaluate the running property then. - { - restart(); - running = Qt.binding(function() { return !materialTypeButton.containsMouse && !colorPopup.itemHovered > 0; }); - showSubTimer.running = false; - } - onTriggered: colorPopup.close() - } - - Popup - { - id: colorPopup - width: materialColorsList.width + padding * 2 - height: materialColorsList.height + padding * 2 - onOpened: - { - // This will be resolved before opening the popup if directly assigned to the properties - // This forces these values to update whenever a popup is opened - var popupHeight = model.colors.count * UM.Theme.getSize("menu").height - var parentGlobalY = parent.mapToItem(null, 0, 0).y - var overflowY = (parentGlobalY + popupHeight) - mainWindow.height - colorPopup.y = overflowY > 0 ? - overflowY - UM.Theme.getSize("default_lining").height : -UM.Theme.getSize("default_lining").height - - var parentGlobalX = materialTypesList.mapToItem(null, 0, 0).x - var overflowX = (parentGlobalX + parent.width + colorPopup.width) - mainWindow.width - colorPopup.x = overflowX > 0 ? parent.width - overflowX : parent.width - - scrollView.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight - colorPopup.height = popupHeight > mainWindow.height ? mainWindow.height : popupHeight - } - - property int itemHovered: 0 - padding: background.border.width - - background: Rectangle - { - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("lining") - border.width: UM.Theme.getSize("default_lining").width - } - ScrollView - { - id: scrollView - width: UM.Theme.getSize("menu").width + scrollbar.width - height: parent.height - clip: true - - ScrollBar.vertical: UM.ScrollBar + delegate: Rectangle { - id: scrollbar - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - } + height: UM.Theme.getSize("menu").height + width: parent.width - Column - { - id: materialColorsList - property var brandColors: model.colors - width: UM.Theme.getSize("menu").width - height: parent.height - spacing: 0 + color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("main_background") - Repeater + MouseArea { - model: parent.brandColors - - delegate: Rectangle + id: materialColorButton + anchors.fill: parent + hoverEnabled: true + onClicked: { - height: UM.Theme.getSize("menu").height - width: parent.width + Cura.MachineManager.setMaterial(extruderIndex, model.container_node); + menuPopup.close(); + colorPopup.close(); + materialMenu.close(); + } + onEntered: + { + menuPopup.itemHovered += 1; + colorPopup.itemHovered += 1; + } + onExited: + { + menuPopup.itemHovered -= 1; + colorPopup.itemHovered -= 1; + } + } - color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" + Item + { + height: parent.height + width: parent.width + opacity: materialBrandMenu.enabled ? 1 : 0.5 + anchors.fill: parent - Item - { - height: parent.height - width: parent.width - opacity: materialBrandMenu.enabled ? 1 : 0.5 - anchors.fill: parent + //Checkmark, if the material is selected. + UM.ColorImage + { + id: checkmark + visible: model.id === materialMenu.activeMaterialId + height: UM.Theme.getSize("default_arrow").height + width: height + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.verticalCenter: parent.verticalCenter + source: UM.Theme.getIcon("Check", "low") + color: UM.Theme.getColor("setting_control_text") + } - //Checkmark, if the material is selected. - UM.ColorImage - { - id: checkmark - visible: model.id === materialMenu.activeMaterialId - height: UM.Theme.getSize("default_arrow").height - width: height - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.verticalCenter: parent.verticalCenter - source: UM.Theme.getIcon("Check", "low") - color: UM.Theme.getColor("setting_control_text") - } + UM.Label + { + text: model.name + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width - UM.Label - { - text: model.name - anchors.left: parent.left - anchors.leftMargin: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("default_arrow").height - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width - - elide: Label.ElideRight - wrapMode: Text.NoWrap - } - } - - MouseArea - { - id: materialColorButton - anchors.fill: parent - - hoverEnabled: true - onClicked: - { - Cura.MachineManager.setMaterial(extruderIndex, model.container_node); - menuPopup.close(); - colorPopup.close(); - materialMenu.close(); - } - onEntered: - { - menuPopup.itemHovered += 1; - colorPopup.itemHovered += 1; - } - onExited: - { - menuPopup.itemHovered -= 1; - colorPopup.itemHovered -= 1; - } - } + elide: Label.ElideRight + wrapMode: Text.NoWrap } } } diff --git a/resources/qml/Menus/MaterialBrandSubMenu.qml b/resources/qml/Menus/MaterialBrandSubMenu.qml new file mode 100644 index 0000000000..787a945766 --- /dev/null +++ b/resources/qml/Menus/MaterialBrandSubMenu.qml @@ -0,0 +1,117 @@ +// Copyright (c) 2022 UltiMaker +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.4 +import QtQuick.Layouts 2.7 + +import UM 1.5 as UM +import Cura 1.7 as Cura + +Popup +{ + id: materialBrandSubMenu + + bottomPadding: UM.Theme.getSize("thin_margin").height + topPadding: UM.Theme.getSize("thin_margin").height + + implicitWidth: scrollViewContent.width + scrollbar.width + leftPadding + rightPadding + implicitHeight: scrollViewContent.height + bottomPadding + topPadding + + // offset position relative to the parent + property int implicitX: parent.width + property int implicitY: -UM.Theme.getSize("thin_margin").height + + default property alias contents: scrollViewContent.children + + x: implicitX + y: implicitY + + // needed for the `mapToItem` function to work; apparently a Popup is not an Item + Item + { + id: materialBrandSubMenu + anchors.fill: parent + } + + onOpened: + { + // we want to make sure here that the popup never goes out side the window so we adjust the x and y position + // based on the width/height of the mainWindow/popup. QML is a bit weird here though, as the globalPosition + // is in absolute coordinates relative to the origin of the mainWindow while setting the x and y coordinates + // of the popup only changes the position relative to the parent. + + // reset position, the remainder of the function asumes this position and size + materialBrandSubMenu.x = implicitX; + materialBrandSubMenu.y = implicitY; + materialBrandSubMenu.width = implicitWidth; + materialBrandSubMenu.height = implicitHeight; + + const globalPosition = materialBrandSubMenu.mapToItem(null, 0, 0); + + if (globalPosition.y > mainWindow.height - materialBrandSubMenu.height) + { + if (mainWindow.height > materialBrandSubMenu.height) + { + const targetY = mainWindow.height - materialBrandSubMenu.height; + const deltaY = globalPosition.y - targetY; + materialBrandSubMenu.y = implicitY - deltaY; + } + else + { + // if popup is taller then the the component, limit + // the components height and set the position to + // y = 0 (in absolute coordinates) + materialBrandSubMenu.y = implicitY - globalPosition.y; + materialBrandSubMenu.height = mainWindow.height; + } + } + + if (globalPosition.x > mainWindow.width - materialBrandSubMenu.width) + { + if (mainWindow.width > materialBrandSubMenu.width) + { + const targetY = mainWindow.width - materialBrandSubMenu.width; + const deltaX = globalPosition.x - targetY; + materialBrandSubMenu.x = implicitX - deltaX; + } + else + { + materialBrandSubMenu.x = implicitX - globalPosition.x; + materialBrandSubMenu.width = mainWindow.width; + } + } + } + + padding: background.border.width + + background: Rectangle + { + color: UM.Theme.getColor("main_background") + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + } + + ScrollView + { + id: scrollView + anchors.fill: parent + contentHeight: scrollViewContent.height + clip: true + + ScrollBar.vertical: UM.ScrollBar + { + id: scrollbar + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + } + + Rectangle + { + id: scrollViewContent + width: childrenRect.width + height: childrenRect.height + } + } +} \ No newline at end of file From 634288a37ce14566ffbafa1155752fe94325cb44 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Dec 2022 12:09:47 +0100 Subject: [PATCH 36/43] Fix spelling mistakes. part of CURA-9522 --- resources/qml/Menus/MaterialBrandMenu.qml | 2 +- resources/qml/Menus/MaterialBrandSubMenu.qml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index e514de04a4..83a6959183 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -36,7 +36,7 @@ Cura.MenuItem UM.Label { - id: brandLableText + id: brandLabelText text: replaceText(materialBrandMenu.text) Layout.fillWidth: true Layout.fillHeight:true diff --git a/resources/qml/Menus/MaterialBrandSubMenu.qml b/resources/qml/Menus/MaterialBrandSubMenu.qml index 787a945766..e2c76518f7 100644 --- a/resources/qml/Menus/MaterialBrandSubMenu.qml +++ b/resources/qml/Menus/MaterialBrandSubMenu.qml @@ -71,8 +71,8 @@ Popup { if (mainWindow.width > materialBrandSubMenu.width) { - const targetY = mainWindow.width - materialBrandSubMenu.width; - const deltaX = globalPosition.x - targetY; + const targetX = mainWindow.width - materialBrandSubMenu.width; + const deltaX = globalPosition.x - targetX; materialBrandSubMenu.x = implicitX - deltaX; } else From d351458b109d964d577edb016b9cb538fdce8e5d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Dec 2022 12:11:21 +0100 Subject: [PATCH 37/43] Make identifier unique and call the correct one. Wouldn't start for me without (from source, on Windows). part of CURA-9522 --- resources/qml/Menus/MaterialBrandSubMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/MaterialBrandSubMenu.qml b/resources/qml/Menus/MaterialBrandSubMenu.qml index e2c76518f7..c2cbd7f911 100644 --- a/resources/qml/Menus/MaterialBrandSubMenu.qml +++ b/resources/qml/Menus/MaterialBrandSubMenu.qml @@ -30,7 +30,7 @@ Popup // needed for the `mapToItem` function to work; apparently a Popup is not an Item Item { - id: materialBrandSubMenu + id: materialBrandSubMenuItem anchors.fill: parent } @@ -47,7 +47,7 @@ Popup materialBrandSubMenu.width = implicitWidth; materialBrandSubMenu.height = implicitHeight; - const globalPosition = materialBrandSubMenu.mapToItem(null, 0, 0); + const globalPosition = materialBrandSubMenuItem.mapToItem(null, 0, 0); if (globalPosition.y > mainWindow.height - materialBrandSubMenu.height) { From a8570920bd3740c789e3243db1902e122771e93b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 27 Dec 2022 12:32:23 +0100 Subject: [PATCH 38/43] Make it work in dark-mode again. part of CURA-9522 --- resources/qml/Menus/MaterialBrandSubMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Menus/MaterialBrandSubMenu.qml b/resources/qml/Menus/MaterialBrandSubMenu.qml index c2cbd7f911..af7e6cfb0e 100644 --- a/resources/qml/Menus/MaterialBrandSubMenu.qml +++ b/resources/qml/Menus/MaterialBrandSubMenu.qml @@ -112,6 +112,7 @@ Popup id: scrollViewContent width: childrenRect.width height: childrenRect.height + color: UM.Theme.getColor("main_background") } } } \ No newline at end of file From c0371f2a0edf5c7bc80b041378ec95554bff3a36 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 27 Dec 2022 14:18:31 +0100 Subject: [PATCH 39/43] Lock pyinstaller version 5.6.2 The new version 5.7.0 won't install correctly on my PC. Need to double check if this is a local problem, if that is the case it should be reverted. Contributes to CURA-10072 --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b1e52571ca..cd7b19e389 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ pytest -pyinstaller +pyinstaller==5.6.2 pyinstaller-hooks-contrib pyyaml sip==6.5.1 From 6aa6786535c1969f1c8b9973f59a268d37d68ed1 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 27 Dec 2022 16:29:08 +0100 Subject: [PATCH 40/43] Exclude executables when running heat This allows for fine-grained control of our executables later on. Contributes to CURA-9157 --- packaging/msi/ExcludeComponents.xslt | 37 ++++++++++++++++++++++++++ packaging/msi/UltiMaker-Cura.wxs.jinja | 2 ++ packaging/msi/create_windows_msi.py | 9 ++++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 packaging/msi/ExcludeComponents.xslt diff --git a/packaging/msi/ExcludeComponents.xslt b/packaging/msi/ExcludeComponents.xslt new file mode 100644 index 0000000000..b964484922 --- /dev/null +++ b/packaging/msi/ExcludeComponents.xslt @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja index be8ddd41f7..b952df1d98 100644 --- a/packaging/msi/UltiMaker-Cura.wxs.jinja +++ b/packaging/msi/UltiMaker-Cura.wxs.jinja @@ -109,6 +109,8 @@ + + diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py index f7c9e19450..06cacb23be 100644 --- a/packaging/msi/create_windows_msi.py +++ b/packaging/msi/create_windows_msi.py @@ -57,17 +57,24 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s except shutil.SameFileError: pass + try: + shutil.copy(source_loc.joinpath("packaging", "msi", "ExcludeComponents.xslt"), + work_loc.joinpath("ExcludeComponents.xslt")) + except shutil.SameFileError: + pass def build(dist_path: Path, filename: str): dist_loc = Path(os.getcwd(), dist_path) work_loc = work_path(filename) wxs_loc = work_loc.joinpath("UltiMaker-Cura.wxs") heat_loc = work_loc.joinpath("HeatFile.wxs") + exclude_components_loc = work_loc.joinpath("ExcludeComponents.xslt") manageoldcuradlg_loc = work_loc.joinpath("CustomizeCuraDlg.wxs") build_loc = work_loc.joinpath("build_msi") heat_command = ["heat", "dir", f"{dist_loc.as_posix()}\\", "-dr", "APPLICATIONFOLDER", "-cg", "NewFilesGroup", - "-gg", "-g1", "-sf", "-srd", "-var", "var.CuraDir", "-out", f"{heat_loc.as_posix()}"] + "-gg", "-g1", "-sf", "-srd", "-var", "var.CuraDir", "-t", f"{exclude_components_loc.as_posix()}", + "-out", f"{heat_loc.as_posix()}"] subprocess.call(heat_command) build_command = ["candle", "-arch", "x64", f"-dCuraDir={dist_loc}\\", "-out", f"{build_loc.as_posix()}\\", From a4e9a685ef6085d3320c859562149da8579f6fd2 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 27 Dec 2022 16:29:46 +0100 Subject: [PATCH 41/43] Clean-up build artifacts Contributes to CURA-9157 --- packaging/msi/create_windows_msi.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py index 06cacb23be..5b1c97ea99 100644 --- a/packaging/msi/create_windows_msi.py +++ b/packaging/msi/create_windows_msi.py @@ -63,6 +63,16 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s except shutil.SameFileError: pass + +def cleanup_artifacts(dist_path: Path): + dist_loc = Path(os.getcwd(), dist_path) + dirt = [d for d in dist_loc.rglob("__pycache__") if d.is_dir()] + dirt += [d for d in dist_loc.rglob("*.dist-info") if d.is_dir()] + for d in dirt: + if d.exists(): + shutil.rmtree(d, ignore_errors=True) + + def build(dist_path: Path, filename: str): dist_loc = Path(os.getcwd(), dist_path) work_loc = work_path(filename) @@ -97,4 +107,5 @@ if __name__ == "__main__": parser.add_argument("name", type=str, help="App name (e.g. 'UltiMaker Cura')") args = parser.parse_args() generate_wxs(args.source_path, args.dist_path, args.filename, args.name) + cleanup_artifacts(args.dist_path) build(args.dist_path, args.filename) From ddd7ac58b02e79d695a503d995a2dab1d991eb50 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 28 Dec 2022 09:40:54 +0100 Subject: [PATCH 42/43] Register file extension CURA-9157 --- packaging/msi/UltiMaker-Cura.wxs.jinja | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja index b952df1d98..a4dcb0b2ef 100644 --- a/packaging/msi/UltiMaker-Cura.wxs.jinja +++ b/packaging/msi/UltiMaker-Cura.wxs.jinja @@ -28,6 +28,8 @@ IncludeMinimum="no" IncludeMaximum="no" /> + + {% if "Enterpise" in app_name %} @@ -84,6 +86,27 @@ + + + + + + + + + + + + + + + + + + + + + From 5b8bac6a619bd4e7ec6b4e03832c93b518b8a2e3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 29 Dec 2022 18:06:53 +0100 Subject: [PATCH 43/43] Attempt to set file associations and fire-wall exceptions. The fire-wall exceptions work, but the device needs to be restarted. Is that worth it? A more important problem is that windows overhauled the file associations a few years ago. The approach here doesn't work (but is at least consistent with how it worked before, so it might work for Windows < 10 or unupdated). The current go-to approach is the one used by firefox, and it happens after the installer, at first start-up of the program. part of CURA-9157 --- packaging/msi/CustomizeCuraDlg.wxs | 2 +- packaging/msi/UltiMaker-Cura.wxs.jinja | 59 +++++++++++++++++--------- packaging/msi/create_windows_msi.py | 14 +++--- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/packaging/msi/CustomizeCuraDlg.wxs b/packaging/msi/CustomizeCuraDlg.wxs index aed5af8055..a9f1d7c462 100644 --- a/packaging/msi/CustomizeCuraDlg.wxs +++ b/packaging/msi/CustomizeCuraDlg.wxs @@ -27,7 +27,6 @@ 1 - @@ -41,6 +40,7 @@ + diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja index a4dcb0b2ef..124443dd7b 100644 --- a/packaging/msi/UltiMaker-Cura.wxs.jinja +++ b/packaging/msi/UltiMaker-Cura.wxs.jinja @@ -1,5 +1,5 @@ - + + Comments="Copyright (c) {{ year }} UltiMaker B.V." /> @@ -86,26 +86,43 @@ - - + + + - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113,7 +130,7 @@