From ded8ddde759fd23571405bfa5e8f644ae6e12e9d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:07 +0200 Subject: [PATCH 01/14] Move from fdmprinter to fdmextruder --- resources/definitions/fdmextruder.def.json | 11 +++++++++++ resources/definitions/fdmprinter.def.json | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index f60cf63360f..19a114d972f 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -167,6 +167,17 @@ "type": "float", "unit": "mm" }, + "machine_nozzle_head_distance": + { + "label": "Nozzle Length", + "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", + "unit": "mm", + "default_value": 3, + "type": "float", + "settable_per_mesh": false, + "settable_per_extruder": true, + "settable_per_meshgroup": false + }, "machine_nozzle_id": { "default_value": "unknown", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 045bec05a40..8d088fccb13 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -289,17 +289,6 @@ "settable_per_meshgroup": false, "settable_globally": false }, - "machine_nozzle_head_distance": - { - "label": "Nozzle Length", - "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", - "unit": "mm", - "default_value": 3, - "type": "float", - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false - }, "machine_nozzle_expansion_angle": { "label": "Nozzle Angle", From c3a812bd3ca17776ca7c0b81120151e27a9aebb0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:20 +0200 Subject: [PATCH 02/14] atom3 move --- resources/definitions/atom3.def.json | 1 - resources/extruders/atom3_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index c9b54d2f89a..6fab25a96d6 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -65,7 +65,6 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 340 }, "machine_name": { "default_value": "Atom 3" }, - "machine_nozzle_head_distance": { "default_value": 6 }, "machine_shape": { "default_value": "elliptic" }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index ccc7a0bd6b0..fc51a8cf038 100644 --- a/resources/extruders/atom3_extruder_0.def.json +++ b/resources/extruders/atom3_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 6 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } From f79633ab703f60ca24c72da451e175002d31b3fb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:35 +0200 Subject: [PATCH 03/14] diy220 move --- resources/definitions/diy220.def.json | 1 - resources/extruders/diy220_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index f4c2e41364e..ea3e89ab04c 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -35,7 +35,6 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Diytech 220" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json index 4d802b4a8d5..ab271d10067 100644 --- a/resources/extruders/diy220_extruder_0.def.json +++ b/resources/extruders/diy220_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } From 8da6f7287237fb926ad8c08b1e0ad32ce9749df6 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 13:59:51 +0200 Subject: [PATCH 04/14] dxu move --- resources/definitions/dxu.def.json | 1 - resources/extruders/dxu_extruder1.def.json | 1 + resources/extruders/dxu_extruder2.def.json | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index c5eb9720f3b..117edf43db7 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -122,7 +122,6 @@ "machine_name": { "default_value": "dxu" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, "machine_nozzle_expansion_angle": { "default_value": 45 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index de974b81748..b44f79fdac2 100644 --- a/resources/extruders/dxu_extruder1.def.json +++ b/resources/extruders/dxu_extruder1.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json index b4de4712892..358bc69dae4 100644 --- a/resources/extruders/dxu_extruder2.def.json +++ b/resources/extruders/dxu_extruder2.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 19.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_nozzle_size": { "default_value": 0.4 }, From 164224091c6a8b92a5f18cb4b073f3fb49844cd2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:00:03 +0200 Subject: [PATCH 05/14] erzay3d move --- resources/definitions/erzay3d.def.json | 1 - resources/extruders/erzay3d_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 5baadf32e46..af5784e4e67 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -44,7 +44,6 @@ "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 10 }, "machine_name": { "default_value": "Erzay3D" }, - "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_shape": { "default_value": "elliptic" }, "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" }, diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index a4082a6224e..8ba6c573f36 100644 --- a/resources/extruders/erzay3d_extruder_0.def.json +++ b/resources/extruders/erzay3d_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 2.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } From 07aec02a440e12cfd1b9216c0817198a573dbed7 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:00:20 +0200 Subject: [PATCH 06/14] maker_starter move --- resources/definitions/maker_starter.def.json | 1 - resources/extruders/maker_starter_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index e654ee09159..5e5f9dcb5bb 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -27,7 +27,6 @@ "machine_heated_bed": { "default_value": false }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "3DMaker Starter" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_width": { "default_value": 210 }, "raft_airgap": { "default_value": 0.2 }, diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index 1a8877f8ef6..4154b008623 100644 --- a/resources/extruders/maker_starter_extruder_0.def.json +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } From b8d5ad85e8a6fd3b17f82c284b3343f906ec91a8 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:00:45 +0200 Subject: [PATCH 07/14] Mark2 for UM2 move --- resources/definitions/Mark2_for_Ultimaker2.def.json | 1 - resources/extruders/Mark2_extruder1.def.json | 1 + resources/extruders/Mark2_extruder2.def.json | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 789d5d42eca..dab45dd80c6 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -130,7 +130,6 @@ "machine_min_cool_heat_time_window": { "default_value": 15.0 }, "machine_name": { "default_value": "Mark2_for_Ultimaker2" }, "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_show_variants": { "default_value": true }, diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 89992ad450e..9617678f7ec 100644 --- a/resources/extruders/Mark2_extruder1.def.json +++ b/resources/extruders/Mark2_extruder1.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json index 967e32d8b89..b0ea604fbb4 100644 --- a/resources/extruders/Mark2_extruder2.def.json +++ b/resources/extruders/Mark2_extruder2.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } From cfb46d3792ba49dd4edce29718b6afa2ee3948f1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:02 +0200 Subject: [PATCH 08/14] mendel90 move --- resources/definitions/mendel90.def.json | 1 - resources/extruders/mendel90_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 57e1276e6ac..d8619fe276a 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -37,7 +37,6 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "Mendel90" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, "machine_width": { "default_value": 200 }, diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index 0701164a65b..b04e2d2fe99 100644 --- a/resources/extruders/mendel90_extruder_0.def.json +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } From e2ea625a7b08320c7b4c487b6e09c582ec6e79a1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:25 +0200 Subject: [PATCH 09/14] structure3d_discov3ry move --- .../definitions/structur3d_discov3ry1_complete_um2plus.def.json | 1 - .../structur3d_discov3ry1_complete_um2plus_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index c013c49e05b..722f4dade54 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -78,7 +78,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." }, "machine_width": { "default_value": 205 }, diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index 0258f9da9c0..ec25298a5c7 100644 --- a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.84 }, "material_diameter": { "default_value": 3.175 } } From d498a883333c67e782820a8922b5ef1252016b3e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:34 +0200 Subject: [PATCH 10/14] tam move --- resources/definitions/tam.def.json | 1 - resources/extruders/tam_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 84bbc9c8fb3..01437cebe70 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -44,7 +44,6 @@ "machine_max_acceleration_y": { "default_value": 6000 }, "machine_max_acceleration_z": { "default_value": 12000 }, "machine_name": { "default_value": "TypeAMachines" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150 Z25 F12000 ;recenter and begin\nG1 F9000" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index b606474ff01..4e5cbe42164 100644 --- a/resources/extruders/tam_extruder_0.def.json +++ b/resources/extruders/tam_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } From 98b007fb0ee033d3a256ec867839dd88dab362c1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:01:46 +0200 Subject: [PATCH 11/14] Um2 move --- resources/definitions/ultimaker2.def.json | 1 - resources/extruders/ultimaker2_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 8c0e066cd18..d749c96a001 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -95,7 +95,6 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Ultimaker 2" }, - "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 17d0d425df6..3432ace596d 100644 --- a/resources/extruders/ultimaker2_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } From 3c8f2f965b5fa04b529b6ddf31e71dad9d723b17 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:02:16 +0200 Subject: [PATCH 12/14] Um2plus move --- resources/definitions/ultimaker2_plus.def.json | 1 - resources/extruders/ultimaker2_plus_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index b5ad30bb8d6..c06d8b1e68c 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -83,7 +83,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "speed_infill": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index 3fec85805e8..ace4b5b8131 100644 --- a/resources/extruders/ultimaker2_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } From ef17a72f1d163da62995835d9b06b7919f428c2f Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 14:02:34 +0200 Subject: [PATCH 13/14] Um2 plus connect move --- resources/definitions/ultimaker2_plus_connect.def.json | 1 - resources/extruders/ultimaker2_plus_connect_extruder_0.def.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 8aae2d4c195..6cdd3e97058 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -92,7 +92,6 @@ "machine_heat_zone_length": { "default_value": 20 }, "machine_height": { "default_value": 205 }, "machine_name": { "default_value": "Ultimaker 2+ Connect" }, - "machine_nozzle_head_distance": { "default_value": 5 }, "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, "machine_width": { "default_value": 223 }, diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json index 0b74aae0194..9ad61af3133 100644 --- a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json @@ -10,6 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_head_distance": { "default_value": 5 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } From 882c57ec730c5c54f8ef97a0fb6ec110888a82b2 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 5 Aug 2024 12:03:32 +0000 Subject: [PATCH 14/14] Applied printer-linter format --- resources/definitions/fdmextruder.def.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 19a114d972f..101efee3b10 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -169,14 +169,14 @@ }, "machine_nozzle_head_distance": { - "label": "Nozzle Length", - "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", - "unit": "mm", "default_value": 3, - "type": "float", - "settable_per_mesh": false, + "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", + "label": "Nozzle Length", "settable_per_extruder": true, - "settable_per_meshgroup": false + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" }, "machine_nozzle_id": {