From f22b86a3cac17b7d22a60f4b0d139c9bac7fe8ce Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Sat, 12 Oct 2024 18:28:31 +0800 Subject: [PATCH 01/31] Add geeetech M1 profile Printing settings for the M1 machine provided by Geeetech officially. --- resources/definitions/geeetech_M1.def.json | 57 +++++++++++++++++++ .../geeetech_M1_0.2.inst.cfg | 13 +++++ .../geeetech_M1_0.3.inst.cfg | 13 +++++ .../geeetech_M1_0.4.inst.cfg | 13 +++++ .../geeetech_M1_0.5.inst.cfg | 13 +++++ .../geeetech_M1_0.6.inst.cfg | 13 +++++ .../geeetech_M1_0.8.inst.cfg | 13 +++++ .../geeetech_M1_1.0.inst.cfg | 13 +++++ 8 files changed, 148 insertions(+) create mode 100644 resources/definitions/geeetech_M1.def.json create mode 100644 resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json new file mode 100644 index 0000000000..02a59eb1c0 --- /dev/null +++ b/resources/definitions/geeetech_M1.def.json @@ -0,0 +1,57 @@ +{ + "version": 2, + "name": "Geeetech M1", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 105 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 95 }, + "machine_name": { "default_value": "Geeetech M1" }, + "machine_start_gcode": { "default_value": "\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 105 }, + "retraction_amount": { "value": 1 }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 200 else 230" + }, + "speed_print": + { + "maximum_value_warning": "200", + "value": 120 + }, + "speed_wall": + { + "maximum_value_warning": "200", + "value": 80 + }, + "speed_wall_0": + { "maximum_value_warning": "200", + "value": 50 + }, + "speed_wall_x": + { "maximum_value_warning": "200", + "value": 80 + }, + "speed_topbottom": + { "maximum_value_warning": "200", + "value": 60 + } + } +} \ No newline at end of file diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg new file mode 100644 index 0000000000..055fbeb747 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg new file mode 100644 index 0000000000..a442fb90d9 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg new file mode 100644 index 0000000000..d33b7647a9 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg new file mode 100644 index 0000000000..49cb4702b2 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg new file mode 100644 index 0000000000..b2afb9c63e --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg new file mode 100644 index 0000000000..15a4c2c58d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg new file mode 100644 index 0000000000..4749c6c464 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + From b66cc9d990e56a4356aec7deee518b7dc282d207 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Sat, 12 Oct 2024 10:30:18 +0000 Subject: [PATCH 02/31] Applied printer-linter format --- resources/definitions/geeetech_M1.def.json | 45 ++++++++++++---------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json index 02a59eb1c0..f0ee942386 100644 --- a/resources/definitions/geeetech_M1.def.json +++ b/resources/definitions/geeetech_M1.def.json @@ -25,33 +25,36 @@ "machine_name": { "default_value": "Geeetech M1" }, "machine_start_gcode": { "default_value": "\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, "machine_width": { "default_value": 105 }, - "retraction_amount": { "value": 1 }, - "material_print_temperature": + "material_print_temperature": { "maximum_value": "250", "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 200 else 230" - }, - "speed_print": + }, + "retraction_amount": { "value": 1 }, + "speed_print": { "maximum_value_warning": "200", "value": 120 }, - "speed_wall": - { - "maximum_value_warning": "200", - "value": 80 - }, - "speed_wall_0": - { "maximum_value_warning": "200", - "value": 50 - }, - "speed_wall_x": - { "maximum_value_warning": "200", - "value": 80 - }, - "speed_topbottom": - { "maximum_value_warning": "200", - "value": 60 - } + "speed_topbottom": + { + "maximum_value_warning": "200", + "value": 60 + }, + "speed_wall": + { + "maximum_value_warning": "200", + "value": 80 + }, + "speed_wall_0": + { + "maximum_value_warning": "200", + "value": 50 + }, + "speed_wall_x": + { + "maximum_value_warning": "200", + "value": 80 + } } } \ No newline at end of file From 72f1ac1a0341f216fbb0fde9e39547f80e826c19 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Thu, 24 Oct 2024 14:36:45 +0800 Subject: [PATCH 03/31] All issue items processed. --- resources/definitions/geeetech_M1.def.json | 6 +++--- .../variants/geeetech_variants/geeetech_M1_0.2.inst.cfg | 2 +- .../variants/geeetech_variants/geeetech_M1_0.3.inst.cfg | 2 +- .../variants/geeetech_variants/geeetech_M1_0.4.inst.cfg | 2 +- .../variants/geeetech_variants/geeetech_M1_0.5.inst.cfg | 2 +- .../variants/geeetech_variants/geeetech_M1_0.6.inst.cfg | 2 +- .../variants/geeetech_variants/geeetech_M1_0.8.inst.cfg | 2 +- .../variants/geeetech_variants/geeetech_M1_1.0.inst.cfg | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json index f0ee942386..4afb9f4d60 100644 --- a/resources/definitions/geeetech_M1.def.json +++ b/resources/definitions/geeetech_M1.def.json @@ -23,12 +23,12 @@ }, "machine_height": { "default_value": 95 }, "machine_name": { "default_value": "Geeetech M1" }, - "machine_start_gcode": { "default_value": "\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_start_gcode": { "default_value": ";Geeetech M1 official wiki URL for M1：https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, "machine_width": { "default_value": 105 }, "material_print_temperature": { - "maximum_value": "250", - "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 200 else 230" + "maximum_value": "230", + "value": "205 if speed_infill <=100 else 215 if speed_infill <= 150 else 220 if speed_infill <= 200 else 230" }, "retraction_amount": { "value": 1 }, "speed_print": diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg index 055fbeb747..2ab1f4dd00 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg index a442fb90d9..f2cd78d138 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg index d33b7647a9..aee452940d 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg index 49cb4702b2..dbd7e2a69c 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg index b2afb9c63e..9c542b5fb2 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg index 15a4c2c58d..628e670353 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg index 4749c6c464..7a7618760a 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] From 7be35b6bc14a61b2376d3c0e8f8336463f3b62d7 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Thu, 24 Oct 2024 06:37:41 +0000 Subject: [PATCH 04/31] Applied printer-linter format --- resources/definitions/geeetech_M1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json index 4afb9f4d60..fe4b248305 100644 --- a/resources/definitions/geeetech_M1.def.json +++ b/resources/definitions/geeetech_M1.def.json @@ -23,7 +23,7 @@ }, "machine_height": { "default_value": 95 }, "machine_name": { "default_value": "Geeetech M1" }, - "machine_start_gcode": { "default_value": ";Geeetech M1 official wiki URL for M1：https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_start_gcode": { "default_value": ";Geeetech M1 official wiki URL for M1\uff1ahttps://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, "machine_width": { "default_value": 105 }, "material_print_temperature": { From a4d9d309638c154ace93267261d43a0f0b5b8e8f Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Fri, 15 Nov 2024 14:39:26 +0800 Subject: [PATCH 05/31] Updated geeetech_M1.def.json --- resources/definitions/geeetech_M1.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json index fe4b248305..2ab9447205 100644 --- a/resources/definitions/geeetech_M1.def.json +++ b/resources/definitions/geeetech_M1.def.json @@ -23,7 +23,7 @@ }, "machine_height": { "default_value": 95 }, "machine_name": { "default_value": "Geeetech M1" }, - "machine_start_gcode": { "default_value": ";Geeetech M1 official wiki URL for M1\uff1ahttps://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_start_gcode": { "default_value": ";Geeetech M1 official wiki URL:https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, "machine_width": { "default_value": 105 }, "material_print_temperature": { From 5a8087d47da74c8ff0611ed4c674170c2023d548 Mon Sep 17 00:00:00 2001 From: JoGrob <59739587+JoGrob@users.noreply.github.com> Date: Sun, 17 Nov 2024 17:15:16 +0100 Subject: [PATCH 06/31] Update sovol_sv01.def.json bowden -> titan --- resources/definitions/sovol_sv01.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/sovol_sv01.def.json b/resources/definitions/sovol_sv01.def.json index 9d77c1c3f6..dd64702f7f 100644 --- a/resources/definitions/sovol_sv01.def.json +++ b/resources/definitions/sovol_sv01.def.json @@ -1,11 +1,11 @@ { "version": 2, "name": "Sovol SV01", - "inherits": "sovol_base_bowden", + "inherits": "sovol_base_titan", "metadata": { "visible": true, - "quality_definition": "sovol_base_bowden" + "quality_definition": "sovol_base_titan" }, "overrides": { @@ -26,4 +26,4 @@ "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, "machine_width": { "default_value": 280 } } -} \ No newline at end of file +} From 3186cce9155d8d1cbee130048a7b6ee2c5efca60 Mon Sep 17 00:00:00 2001 From: Boris Juraga Date: Tue, 21 Jan 2025 09:24:01 +0100 Subject: [PATCH 07/31] initial add of a definition, extruder, quality and variant resources --- resources/definitions/biqu_b2.def.json | 32 ++++++++++++++ .../extruders/biqu_b2_extruder_1.def.json | 16 +++++++ .../biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg | 14 ++++++ .../biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg | 14 ++++++ .../biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg | 14 ++++++ .../biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg | 14 ++++++ .../biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg | 14 ++++++ .../biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg | 14 ++++++ .../biqu/b2/biqu_b2_global_adaptive.inst.cfg | 43 ++++++++++++++++++ .../biqu/b2/biqu_b2_global_draft.inst.cfg | 42 ++++++++++++++++++ .../biqu/b2/biqu_b2_global_low.inst.cfg | 42 ++++++++++++++++++ .../biqu/b2/biqu_b2_global_standard.inst.cfg | 44 +++++++++++++++++++ .../biqu/b2/biqu_b2_global_super.inst.cfg | 42 ++++++++++++++++++ .../biqu/b2/biqu_b2_global_ultra.inst.cfg | 42 ++++++++++++++++++ resources/variants/biqu/biqu_b2_0.2.inst.cfg | 13 ++++++ resources/variants/biqu/biqu_b2_0.3.inst.cfg | 13 ++++++ resources/variants/biqu/biqu_b2_0.4.inst.cfg | 13 ++++++ resources/variants/biqu/biqu_b2_0.5.inst.cfg | 13 ++++++ resources/variants/biqu/biqu_b2_0.6.inst.cfg | 13 ++++++ resources/variants/biqu/biqu_b2_0.8.inst.cfg | 13 ++++++ 20 files changed, 465 insertions(+) create mode 100644 resources/definitions/biqu_b2.def.json create mode 100644 resources/extruders/biqu_b2_extruder_1.def.json create mode 100644 resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg create mode 100644 resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg create mode 100644 resources/variants/biqu/biqu_b2_0.2.inst.cfg create mode 100644 resources/variants/biqu/biqu_b2_0.3.inst.cfg create mode 100644 resources/variants/biqu/biqu_b2_0.4.inst.cfg create mode 100644 resources/variants/biqu/biqu_b2_0.5.inst.cfg create mode 100644 resources/variants/biqu/biqu_b2_0.6.inst.cfg create mode 100644 resources/variants/biqu/biqu_b2_0.8.inst.cfg diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json new file mode 100644 index 0000000000..d5ed45ee85 --- /dev/null +++ b/resources/definitions/biqu_b2.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Biqu B2", + "inherits": "biqu_b1", + "metadata": + { + "visible": true, + "author": "Boris Juraga", + "machine_extruder_trains": { + "0": "biqu_base_extruder_0", + "1": "biqu_b2_extruder_1" + }, + "quality_definition": "biqu_b2" + }, + "overrides": + { + "gantry_height": { "value": 27.5 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-33, 35], + [-33, -23], + [33, -23], + [33, 35] + ] + }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y0" }, + "machine_name": { "default_value": "BIQU B2" }, + "machine_start_gcode": { "default_value": "\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\n\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\n\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \n\nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\n\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 ; start print" } + } +} \ No newline at end of file diff --git a/resources/extruders/biqu_b2_extruder_1.def.json b/resources/extruders/biqu_b2_extruder_1.def.json new file mode 100644 index 0000000000..fc5778b071 --- /dev/null +++ b/resources/extruders/biqu_b2_extruder_1.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "biqu_b2", + "position": "1" + }, + "overrides": + { + "extruder_nr": { "default_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/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..ef478ac259 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = biqu_b2 +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = adaptive +setting_version = 24 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg new file mode 100644 index 0000000000..526aa6bdf2 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = biqu_b2 +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = draft +setting_version = 24 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..8ee3e16ff4 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = biqu_b2 +name = Low Quality +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = low +setting_version = 24 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..fd6ea4287d --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = biqu_b2 +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = standard +setting_version = 24 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..4d2899b599 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = biqu_b2 +name = Super Quality +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = super +setting_version = 24 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..247fdcf1a8 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = biqu_b2 +name = Ultra Quality +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = ultra +setting_version = 24 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg new file mode 100644 index 0000000000..81178fdeed --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg @@ -0,0 +1,43 @@ +[general] +definition = biqu_b2 +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 24 +type = quality +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.20 +support_interface_height = =layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +cool_fan_full_at_height = 0.6 +cool_fan_speed = 50 +material_final_print_temperature = 190 +material_initial_print_temperature = 190 +material_print_temperature = 190 +material_standby_temperature = 190 +optimize_wall_printing_order = True +prime_tower_min_volume = 135 +retraction_amount = 4 +retraction_extra_prime_amount = 2 +retraction_extrusion_window = 8 +retraction_hop = 3 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 10 +retraction_prime_speed = 5 +retraction_speed = 30 +speed_layer_0 = 20 +speed_travel = 60 +speed_wall = 30 +speed_wall_x = 20 +switch_extruder_prime_speed = 10 +switch_extruder_retraction_amount = 40 +switch_extruder_retraction_speeds = 30 diff --git a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg new file mode 100644 index 0000000000..36d50ada37 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = biqu_b2 +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 24 +type = quality +weight = -5 + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +cool_fan_full_at_height = 0.6 +cool_fan_speed = 50 +material_final_print_temperature = 190 +material_initial_print_temperature = 190 +material_print_temperature = 190 +material_standby_temperature = 190 +optimize_wall_printing_order = True +prime_tower_min_volume = 135 +retraction_amount = 4 +retraction_extra_prime_amount = 2 +retraction_extrusion_window = 8 +retraction_hop = 3 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 10 +retraction_prime_speed = 5 +retraction_speed = 30 +speed_layer_0 = 20 +speed_travel = 60 +speed_wall = 30 +speed_wall_x = 20 +switch_extruder_prime_speed = 10 +switch_extruder_retraction_amount = 40 +switch_extruder_retraction_speeds = 30 diff --git a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg new file mode 100644 index 0000000000..2fb4804640 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = biqu_b2 +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 24 +type = quality +weight = -4 + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +cool_fan_full_at_height = 0.6 +cool_fan_speed = 50 +material_final_print_temperature = 190 +material_initial_print_temperature = 190 +material_print_temperature = 190 +material_standby_temperature = 190 +optimize_wall_printing_order = True +prime_tower_min_volume = 135 +retraction_amount = 4 +retraction_extra_prime_amount = 2 +retraction_extrusion_window = 8 +retraction_hop = 3 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 10 +retraction_prime_speed = 5 +retraction_speed = 30 +speed_layer_0 = 20 +speed_travel = 60 +speed_wall = 30 +speed_wall_x = 20 +switch_extruder_prime_speed = 10 +switch_extruder_retraction_amount = 40 +switch_extruder_retraction_speeds = 30 diff --git a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg new file mode 100644 index 0000000000..4d2b5660b6 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg @@ -0,0 +1,44 @@ +[general] +definition = biqu_b2 +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 24 +type = quality +weight = -3 +position = 0 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +brim_width = 4 +cool_fan_full_at_height = 0.6 +cool_fan_speed = 50 +material_final_print_temperature = 190 +material_initial_print_temperature = 190 +material_print_temperature = 190 +material_standby_temperature = 190 +optimize_wall_printing_order = True +prime_tower_min_volume = 135 +retraction_amount = 4 +retraction_extra_prime_amount = 2 +retraction_extrusion_window = 8 +retraction_hop = 3 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 10 +retraction_prime_speed = 5 +retraction_speed = 30 +speed_layer_0 = 20 +speed_travel = 60 +speed_wall = 30 +speed_wall_x = 20 +switch_extruder_prime_speed = 10 +switch_extruder_retraction_amount = 40 +switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg new file mode 100644 index 0000000000..fc9860a695 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = biqu_b2 +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = super +setting_version = 24 +type = quality +weight = -1 + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +cool_fan_full_at_height = 0.6 +cool_fan_speed = 50 +material_final_print_temperature = 190 +material_initial_print_temperature = 190 +material_print_temperature = 190 +material_standby_temperature = 190 +optimize_wall_printing_order = True +prime_tower_min_volume = 135 +retraction_amount = 4 +retraction_extra_prime_amount = 2 +retraction_extrusion_window = 8 +retraction_hop = 3 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 10 +retraction_prime_speed = 5 +retraction_speed = 30 +speed_layer_0 = 20 +speed_travel = 60 +speed_wall = 30 +speed_wall_x = 20 +switch_extruder_prime_speed = 10 +switch_extruder_retraction_amount = 40 +switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg new file mode 100644 index 0000000000..55fad68102 --- /dev/null +++ b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg @@ -0,0 +1,42 @@ +[general] +definition = biqu_b2 +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 24 +type = quality +weight = 0 + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +support_interface_height = =layer_height*12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*4 +cool_fan_full_at_height = 0.6 +cool_fan_speed = 50 +material_final_print_temperature = 190 +material_initial_print_temperature = 190 +material_print_temperature = 190 +material_standby_temperature = 190 +optimize_wall_printing_order = True +prime_tower_min_volume = 135 +retraction_amount = 4 +retraction_extra_prime_amount = 2 +retraction_extrusion_window = 8 +retraction_hop = 3 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = 10 +retraction_prime_speed = 5 +retraction_speed = 30 +speed_layer_0 = 20 +speed_travel = 60 +speed_wall = 30 +speed_wall_x = 20 +switch_extruder_prime_speed = 10 +switch_extruder_retraction_amount = 40 +switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/variants/biqu/biqu_b2_0.2.inst.cfg b/resources/variants/biqu/biqu_b2_0.2.inst.cfg new file mode 100644 index 0000000000..8f7d063b93 --- /dev/null +++ b/resources/variants/biqu/biqu_b2_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = biqu_b2 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 24 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/biqu/biqu_b2_0.3.inst.cfg b/resources/variants/biqu/biqu_b2_0.3.inst.cfg new file mode 100644 index 0000000000..e6381dfe80 --- /dev/null +++ b/resources/variants/biqu/biqu_b2_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = biqu_b2 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 24 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/biqu/biqu_b2_0.4.inst.cfg b/resources/variants/biqu/biqu_b2_0.4.inst.cfg new file mode 100644 index 0000000000..99958af88d --- /dev/null +++ b/resources/variants/biqu/biqu_b2_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = biqu_b2 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 24 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/biqu/biqu_b2_0.5.inst.cfg b/resources/variants/biqu/biqu_b2_0.5.inst.cfg new file mode 100644 index 0000000000..194e5a79c4 --- /dev/null +++ b/resources/variants/biqu/biqu_b2_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = biqu_b2 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 24 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/biqu/biqu_b2_0.6.inst.cfg b/resources/variants/biqu/biqu_b2_0.6.inst.cfg new file mode 100644 index 0000000000..828843f658 --- /dev/null +++ b/resources/variants/biqu/biqu_b2_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = biqu_b2 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 24 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/biqu/biqu_b2_0.8.inst.cfg b/resources/variants/biqu/biqu_b2_0.8.inst.cfg new file mode 100644 index 0000000000..8bc16cfade --- /dev/null +++ b/resources/variants/biqu/biqu_b2_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = biqu_b2 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 24 +type = variant + +[values] +machine_nozzle_size = 0.8 + From b56f7db5a05b3dfbeed61939f5a538d20d6ef757 Mon Sep 17 00:00:00 2001 From: Boris Juraga Date: Tue, 21 Jan 2025 14:19:42 +0100 Subject: [PATCH 08/31] learned about shared nozzles and shared heaters --- resources/definitions/biqu_b2.def.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index d5ed45ee85..6768751716 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -27,6 +27,9 @@ }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y0" }, "machine_name": { "default_value": "BIQU B2" }, - "machine_start_gcode": { "default_value": "\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\n\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\n\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \n\nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\n\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 ; start print" } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0 ; start print" }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 } } } \ No newline at end of file From 369600c29acb088ab1b763878b35c8a128c27773 Mon Sep 17 00:00:00 2001 From: Boris Juraga Date: Thu, 30 Jan 2025 14:41:51 +0100 Subject: [PATCH 09/31] profile looks good --- resources/definitions/biqu_b2.def.json | 4 ++- .../biqu/b2/biqu_b2_global_adaptive.inst.cfg | 25 ++++--------------- .../biqu/b2/biqu_b2_global_draft.inst.cfg | 25 ++++--------------- .../biqu/b2/biqu_b2_global_low.inst.cfg | 25 ++++--------------- .../biqu/b2/biqu_b2_global_standard.inst.cfg | 24 +++--------------- .../biqu/b2/biqu_b2_global_super.inst.cfg | 23 +++-------------- .../biqu/b2/biqu_b2_global_ultra.inst.cfg | 23 +++-------------- 7 files changed, 30 insertions(+), 119 deletions(-) diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index 6768751716..c174db33db 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -30,6 +30,8 @@ "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0 ; start print" }, "machine_extruders_share_heater": { "default_value": true }, "machine_extruders_share_nozzle": { "default_value": true }, - "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 } + "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 }, + "prime_tower_enable": { "default_value": true }, + "prime_tower_mode": { "default_value": "interleaved" } } } \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg index 81178fdeed..cd755a1cff 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg @@ -17,27 +17,12 @@ layer_height_0 = 0.20 support_interface_height = =layer_height*6 top_bottom_thickness = =layer_height_0+layer_height*4 wall_thickness = =line_width*3 -cool_fan_full_at_height = 0.6 -cool_fan_speed = 50 -material_final_print_temperature = 190 -material_initial_print_temperature = 190 +material_final_print_temperature = 195 +material_initial_print_temperature = 195 material_print_temperature = 190 -material_standby_temperature = 190 +material_standby_temperature = 195 optimize_wall_printing_order = True -prime_tower_min_volume = 135 -retraction_amount = 4 -retraction_extra_prime_amount = 2 -retraction_extrusion_window = 8 -retraction_hop = 3 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 10 -retraction_prime_speed = 5 -retraction_speed = 30 -speed_layer_0 = 20 -speed_travel = 60 -speed_wall = 30 -speed_wall_x = 20 +prime_tower_min_volume = 150 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 +switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg index 36d50ada37..92deadd38c 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg @@ -16,27 +16,12 @@ layer_height_0 = 0.32 support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 -cool_fan_full_at_height = 0.6 -cool_fan_speed = 50 -material_final_print_temperature = 190 -material_initial_print_temperature = 190 +material_final_print_temperature = 195 +material_initial_print_temperature = 195 material_print_temperature = 190 -material_standby_temperature = 190 +material_standby_temperature = 195 optimize_wall_printing_order = True -prime_tower_min_volume = 135 -retraction_amount = 4 -retraction_extra_prime_amount = 2 -retraction_extrusion_window = 8 -retraction_hop = 3 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 10 -retraction_prime_speed = 5 -retraction_speed = 30 -speed_layer_0 = 20 -speed_travel = 60 -speed_wall = 30 -speed_wall_x = 20 +prime_tower_min_volume = 150 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 +switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg index 2fb4804640..0455a6ec20 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg @@ -16,27 +16,12 @@ layer_height_0 = 0.28 support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -cool_fan_full_at_height = 0.6 -cool_fan_speed = 50 -material_final_print_temperature = 190 -material_initial_print_temperature = 190 +material_final_print_temperature = 195 +material_initial_print_temperature = 195 material_print_temperature = 190 -material_standby_temperature = 190 +material_standby_temperature = 195 optimize_wall_printing_order = True -prime_tower_min_volume = 135 -retraction_amount = 4 -retraction_extra_prime_amount = 2 -retraction_extrusion_window = 8 -retraction_hop = 3 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 10 -retraction_prime_speed = 5 -retraction_speed = 30 -speed_layer_0 = 20 -speed_travel = 60 -speed_wall = 30 -speed_wall_x = 20 +prime_tower_min_volume = 150 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 +switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg index 4d2b5660b6..a0fb268e52 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg @@ -17,28 +17,12 @@ layer_height_0 = 0.2 support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -brim_width = 4 -cool_fan_full_at_height = 0.6 -cool_fan_speed = 50 -material_final_print_temperature = 190 -material_initial_print_temperature = 190 +material_final_print_temperature = 195 +material_initial_print_temperature = 195 material_print_temperature = 190 -material_standby_temperature = 190 +material_standby_temperature = 195 optimize_wall_printing_order = True -prime_tower_min_volume = 135 -retraction_amount = 4 -retraction_extra_prime_amount = 2 -retraction_extrusion_window = 8 -retraction_hop = 3 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 10 -retraction_prime_speed = 5 -retraction_speed = 30 -speed_layer_0 = 20 -speed_travel = 60 -speed_wall = 30 -speed_wall_x = 20 +prime_tower_min_volume = 150 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg index fc9860a695..fd54805c04 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg @@ -16,27 +16,12 @@ layer_height_0 = 0.12 support_interface_height = =layer_height*8 top_bottom_thickness = =layer_height_0+layer_height*6 wall_thickness = =line_width*3 -cool_fan_full_at_height = 0.6 -cool_fan_speed = 50 -material_final_print_temperature = 190 -material_initial_print_temperature = 190 +material_final_print_temperature = 195 +material_initial_print_temperature = 195 material_print_temperature = 190 -material_standby_temperature = 190 +material_standby_temperature = 195 optimize_wall_printing_order = True -prime_tower_min_volume = 135 -retraction_amount = 4 -retraction_extra_prime_amount = 2 -retraction_extrusion_window = 8 -retraction_hop = 3 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 10 -retraction_prime_speed = 5 -retraction_speed = 30 -speed_layer_0 = 20 -speed_travel = 60 -speed_wall = 30 -speed_wall_x = 20 +prime_tower_min_volume = 150 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 switch_extruder_retraction_speeds = 30 \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg index 55fad68102..cbc194ceb6 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg @@ -16,27 +16,12 @@ layer_height_0 = 0.12 support_interface_height = =layer_height*12 top_bottom_thickness = =layer_height_0+layer_height*10 wall_thickness = =line_width*4 -cool_fan_full_at_height = 0.6 -cool_fan_speed = 50 -material_final_print_temperature = 190 -material_initial_print_temperature = 190 +material_final_print_temperature = 195 +material_initial_print_temperature = 195 material_print_temperature = 190 -material_standby_temperature = 190 +material_standby_temperature = 195 optimize_wall_printing_order = True -prime_tower_min_volume = 135 -retraction_amount = 4 -retraction_extra_prime_amount = 2 -retraction_extrusion_window = 8 -retraction_hop = 3 -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_min_travel = 10 -retraction_prime_speed = 5 -retraction_speed = 30 -speed_layer_0 = 20 -speed_travel = 60 -speed_wall = 30 -speed_wall_x = 20 +prime_tower_min_volume = 150 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 switch_extruder_retraction_speeds = 30 \ No newline at end of file From ea576d0ee6093a16eeac260beeae0eb3be2c9e9c Mon Sep 17 00:00:00 2001 From: Boris Juraga Date: Sun, 2 Feb 2025 10:44:08 +0100 Subject: [PATCH 10/31] add more clarity to the start/end gcode --- resources/definitions/biqu_b2.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index c174db33db..88ac6d589a 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -25,9 +25,9 @@ [33, 35] ] }, - "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y0" }, + "machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y0\n;END OF CUSTOM END GCODE" }, "machine_name": { "default_value": "BIQU B2" }, - "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0 ; start print" }, + "machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\n;END OF CUSTOM START GCODE\n; start print" }, "machine_extruders_share_heater": { "default_value": true }, "machine_extruders_share_nozzle": { "default_value": true }, "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 }, From e7def395c61dbfe01bd3907b86b6998b4a8ab9aa Mon Sep 17 00:00:00 2001 From: Boris Juraga Date: Sun, 2 Feb 2025 10:59:28 +0100 Subject: [PATCH 11/31] reset extruder to initial one --- resources/definitions/biqu_b2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index 88ac6d589a..6fe0d9004f 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -27,7 +27,7 @@ }, "machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y0\n;END OF CUSTOM END GCODE" }, "machine_name": { "default_value": "BIQU B2" }, - "machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\n;END OF CUSTOM START GCODE\n; start print" }, + "machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\n;END OF CUSTOM START GCODE\nT{initial_extruder_nr} ; RESET EXTRUDER TO INITIAL\n; start print" }, "machine_extruders_share_heater": { "default_value": true }, "machine_extruders_share_nozzle": { "default_value": true }, "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 }, From 87413f6b6da7570ddc557ff23735458b7a442cd9 Mon Sep 17 00:00:00 2001 From: Boris Juraga Date: Thu, 6 Feb 2025 23:28:06 +0100 Subject: [PATCH 12/31] adjust the start and end gcode --- resources/definitions/biqu_b2.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index 6fe0d9004f..3676ca8955 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -25,9 +25,9 @@ [33, 35] ] }, - "machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y0\n;END OF CUSTOM END GCODE" }, + "machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y{machine_depth}\n;END OF CUSTOM END GCODE" }, "machine_name": { "default_value": "BIQU B2" }, - "machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\n;END OF CUSTOM START GCODE\nT{initial_extruder_nr} ; RESET EXTRUDER TO INITIAL\n; start print" }, + "machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\nT{initial_extruder_nr} ; RESET EXTRUDER TO INITIAL\n; start print\n;END OF CUSTOM START GCODE" }, "machine_extruders_share_heater": { "default_value": true }, "machine_extruders_share_nozzle": { "default_value": true }, "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 }, From 06cbb2c65cfb47f0a0126d0f201cdecefb3c7273 Mon Sep 17 00:00:00 2001 From: GregValiant <64202104+GregValiant@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:40:59 -0400 Subject: [PATCH 13/31] Update FilamentChange.py Hide the "Z-Move" when in "use firmware configuration" mode. --- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 6fe28ef2f2..f51ba73ffb 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -92,7 +92,7 @@ class FilamentChange(Script): "type": "float", "default_value": 0, "minimum_value": 0, - "enabled": "enabled" + "enabled": "enabled and not firmware_config" }, "retract_method": { From 1045dc976059f2c4a83103f33240d3e631083d11 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Mon, 31 Mar 2025 12:59:43 +0200 Subject: [PATCH 14/31] Add machine_nozzle_size to variants --- resources/variants/ultimaker_s3_aa04.inst.cfg | 1 + resources/variants/ultimaker_s3_bb04.inst.cfg | 1 + resources/variants/ultimaker_s5_aa04.inst.cfg | 1 + resources/variants/ultimaker_s5_bb04.inst.cfg | 1 + resources/variants/ultimaker_s7_aa04.inst.cfg | 1 + resources/variants/ultimaker_s7_bb04.inst.cfg | 1 + resources/variants/ultimaker_s8_bb04.inst.cfg | 1 + 7 files changed, 7 insertions(+) diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index 94d27e150b..e3f4aaff2b 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -12,6 +12,7 @@ type = variant brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 6.5 speed_print = 70 diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 022b4f945c..7923a5a28e 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -15,6 +15,7 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index ef846a089d..69aae0757e 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -12,6 +12,7 @@ type = variant brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 6.5 speed_print = 70 diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index ce287e127b..294b39b8c7 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -15,6 +15,7 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker_s7_aa04.inst.cfg b/resources/variants/ultimaker_s7_aa04.inst.cfg index 7d5a08d117..ee4ebdceaf 100644 --- a/resources/variants/ultimaker_s7_aa04.inst.cfg +++ b/resources/variants/ultimaker_s7_aa04.inst.cfg @@ -12,6 +12,7 @@ type = variant brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 6.5 speed_print = 70 diff --git a/resources/variants/ultimaker_s7_bb04.inst.cfg b/resources/variants/ultimaker_s7_bb04.inst.cfg index 1bfa216167..18aa61ff4b 100644 --- a/resources/variants/ultimaker_s7_bb04.inst.cfg +++ b/resources/variants/ultimaker_s7_bb04.inst.cfg @@ -15,6 +15,7 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 4.5 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker_s8_bb04.inst.cfg b/resources/variants/ultimaker_s8_bb04.inst.cfg index 388ce27ec2..d92874e448 100644 --- a/resources/variants/ultimaker_s8_bb04.inst.cfg +++ b/resources/variants/ultimaker_s8_bb04.inst.cfg @@ -11,6 +11,7 @@ type = variant [values] machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 +machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 retraction_amount = 4.5 support_bottom_height = =layer_height * 2 From d980b5ae2e3fcb424137591ed3627ff093016d15 Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Tue, 22 Apr 2025 10:36:24 -0500 Subject: [PATCH 15/31] Add support for Toybox Alpha One --- .../definitions/toybox_alpha_one.def.json | 25 +++++++++++++++++++ .../toybox_alpha_one_extruder_0.def.json | 16 ++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 resources/definitions/toybox_alpha_one.def.json create mode 100644 resources/extruders/toybox_alpha_one_extruder_0.def.json diff --git a/resources/definitions/toybox_alpha_one.def.json b/resources/definitions/toybox_alpha_one.def.json new file mode 100644 index 0000000000..a2d83c5f10 --- /dev/null +++ b/resources/definitions/toybox_alpha_one.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toybox Alpha One", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "lukbrew25", + "manufacturer": "Toybox", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "machine_extruder_trains": { "0": "toybox_alpha_one_extruder_0" } + }, + "overrides": + { + "gantry_height": { "value": "0.0" }, + "machine_depth": { "default_value": 80 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_height": { "default_value": 90 }, + "machine_name": { "default_value": "Toybox Alpha One" }, + "machine_start_gcode": { "default_value": "G90\nM82" }, + "machine_width": { "default_value": 70 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/toybox_alpha_one_extruder_0.def.json b/resources/extruders/toybox_alpha_one_extruder_0.def.json new file mode 100644 index 0000000000..a2787d0ed3 --- /dev/null +++ b/resources/extruders/toybox_alpha_one_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "toybox_alpha_one", + "position": "0" + }, + "overrides": + { + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": -3.0 } + } +} \ No newline at end of file From 7ec0fa89ac955cc45ce3014a825bb6637837bbef Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Wed, 23 Apr 2025 10:02:46 -0500 Subject: [PATCH 16/31] Add Alpha 2 to name as both Alpha 1 and 2 are supported by this profile --- ...box_alpha_one.def.json => toybox_alpha_one_two.def.json} | 6 +++--- ..._0.def.json => toybox_alpha_one_two_extruder_0.def.json} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename resources/definitions/{toybox_alpha_one.def.json => toybox_alpha_one_two.def.json} (78%) rename resources/extruders/{toybox_alpha_one_extruder_0.def.json => toybox_alpha_one_two_extruder_0.def.json} (88%) diff --git a/resources/definitions/toybox_alpha_one.def.json b/resources/definitions/toybox_alpha_one_two.def.json similarity index 78% rename from resources/definitions/toybox_alpha_one.def.json rename to resources/definitions/toybox_alpha_one_two.def.json index a2d83c5f10..6dc32a5fa7 100644 --- a/resources/definitions/toybox_alpha_one.def.json +++ b/resources/definitions/toybox_alpha_one_two.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Toybox Alpha One", + "name": "Toybox Alpha One/Two", "inherits": "fdmprinter", "metadata": { @@ -9,7 +9,7 @@ "manufacturer": "Toybox", "file_formats": "text/x-gcode", "has_machine_quality": false, - "machine_extruder_trains": { "0": "toybox_alpha_one_extruder_0" } + "machine_extruder_trains": { "0": "toybox_alpha_one_two_extruder_0" } }, "overrides": { @@ -17,7 +17,7 @@ "machine_depth": { "default_value": 80 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_height": { "default_value": 90 }, - "machine_name": { "default_value": "Toybox Alpha One" }, + "machine_name": { "default_value": "Toybox Alpha One/Two" }, "machine_start_gcode": { "default_value": "G90\nM82" }, "machine_width": { "default_value": 70 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/toybox_alpha_one_extruder_0.def.json b/resources/extruders/toybox_alpha_one_two_extruder_0.def.json similarity index 88% rename from resources/extruders/toybox_alpha_one_extruder_0.def.json rename to resources/extruders/toybox_alpha_one_two_extruder_0.def.json index a2787d0ed3..1bc498f9fb 100644 --- a/resources/extruders/toybox_alpha_one_extruder_0.def.json +++ b/resources/extruders/toybox_alpha_one_two_extruder_0.def.json @@ -4,7 +4,7 @@ "inherits": "fdmextruder", "metadata": { - "machine": "toybox_alpha_one", + "machine": "toybox_alpha_one_two", "position": "0" }, "overrides": From 6f790a6ab65df5bc9ed8eeff80b37c88f2c005ac Mon Sep 17 00:00:00 2001 From: Luke Brewer <79376204+lukbrew25@users.noreply.github.com> Date: Wed, 23 Apr 2025 19:46:27 -0500 Subject: [PATCH 17/31] Add extruder_nr to extruder def.json --- resources/extruders/toybox_alpha_one_two_extruder_0.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/extruders/toybox_alpha_one_two_extruder_0.def.json b/resources/extruders/toybox_alpha_one_two_extruder_0.def.json index 1bc498f9fb..cb39ebf85b 100644 --- a/resources/extruders/toybox_alpha_one_two_extruder_0.def.json +++ b/resources/extruders/toybox_alpha_one_two_extruder_0.def.json @@ -9,6 +9,7 @@ }, "overrides": { + "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": -3.0 } From b0f175bd5a4eca4b81a13949e58d666886c4a450 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 13 May 2025 08:29:30 +0200 Subject: [PATCH 18/31] Add missing error-handling. There was error handling for the url-request, but not for handling the subsequent resolution. --- cura/CuraApplication.py | 57 ++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 87657af5f5..8af98c2d0e 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1895,36 +1895,39 @@ class CuraApplication(QtApplication): query = QUrlQuery(url.query()) model_url = QUrl(query.queryItemValue("file", options=QUrl.ComponentFormattingOption.FullyDecoded)) - def on_finish(response): - content_disposition_header_key = QByteArray("content-disposition".encode()) - - filename = model_url.path().split("/")[-1] + ".stl" - - if response.hasRawHeader(content_disposition_header_key): - # content_disposition is in the format - # ``` - # content_disposition attachment; filename="[FILENAME]" - # ``` - # Use a regex to extract the filename - content_disposition = str(response.rawHeader(content_disposition_header_key).data(), - encoding='utf-8') - content_disposition_match = re.match(r'attachment; filename=(?P.*)', - content_disposition) - if content_disposition_match is not None: - filename = content_disposition_match.group("filename").strip("\"") - - tmp = tempfile.NamedTemporaryFile(suffix=filename, delete=False) - with open(tmp.name, "wb") as f: - f.write(response.readAll()) - - self.readLocalFile(QUrl.fromLocalFile(tmp.name), add_to_recent_files=False) - def on_error(*args, **kwargs): - Logger.log("w", "Could not download file from {0}".format(model_url.url())) - Message("Could not download file: " + str(model_url.url()), + Logger.warning(f"Could not download file from {model_url.url()}") + Message(f"Could not download file: {str(model_url.url())}", title= "Loading Model failed", message_type=Message.MessageType.ERROR).show() - return + + def on_finish(response): + try: + content_disposition_header_key = QByteArray("content-disposition".encode()) + + filename = model_url.path().split("/")[-1] + ".stl" + + if response.hasRawHeader(content_disposition_header_key): + # content_disposition is in the format + # ``` + # content_disposition attachment; filename="[FILENAME]" + # ``` + # Use a regex to extract the filename + content_disposition = str(response.rawHeader(content_disposition_header_key).data(), + encoding='utf-8') + content_disposition_match = re.match(r'attachment; filename=(?P.*)', + content_disposition) + if content_disposition_match is not None: + filename = content_disposition_match.group("filename").strip("\"") + + tmp = tempfile.NamedTemporaryFile(suffix=filename, delete=False) + with open(tmp.name, "wb") as f: + f.write(response.readAll()) + + self.readLocalFile(QUrl.fromLocalFile(tmp.name), add_to_recent_files=False) + except Exception as ex: + Logger.warning(f"Exception {str(ex)}") + on_error() self.getHttpRequestManager().get( model_url.url(), From 28d71c643beba999c83bd3887015070e59289fb6 Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Sat, 7 Jun 2025 17:01:31 +0800 Subject: [PATCH 19/31] Update Geeetech 3D printer profiles Added Geeetech M1, M1S model profiles, and modified Thunder model profiles --- resources/definitions/geeetech_M1.def.json | 13 ++-- resources/definitions/geeetech_M1S.def.json | 59 +++++++++++++++++++ .../definitions/geeetech_Thunder.def.json | 5 +- .../geeetech_M1S_0.2.inst.cfg | 13 ++++ .../geeetech_M1S_0.3.inst.cfg | 13 ++++ .../geeetech_M1S_0.4.inst.cfg | 13 ++++ .../geeetech_M1S_0.5.inst.cfg | 13 ++++ .../geeetech_M1S_0.6.inst.cfg | 13 ++++ .../geeetech_M1S_0.8.inst.cfg | 13 ++++ .../geeetech_M1S_1.0.inst.cfg | 13 ++++ .../geeetech_M1_0.2.inst.cfg | 2 +- .../geeetech_M1_0.3.inst.cfg | 2 +- .../geeetech_M1_0.4.inst.cfg | 2 +- .../geeetech_M1_0.5.inst.cfg | 2 +- .../geeetech_M1_0.6.inst.cfg | 2 +- .../geeetech_M1_0.8.inst.cfg | 2 +- .../geeetech_M1_1.0.inst.cfg | 2 +- 17 files changed, 165 insertions(+), 17 deletions(-) create mode 100644 resources/definitions/geeetech_M1S.def.json create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg create mode 100644 resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json index 2ab9447205..1bb0c5ce0c 100644 --- a/resources/definitions/geeetech_M1.def.json +++ b/resources/definitions/geeetech_M1.def.json @@ -23,14 +23,13 @@ }, "machine_height": { "default_value": 95 }, "machine_name": { "default_value": "Geeetech M1" }, - "machine_start_gcode": { "default_value": ";Geeetech M1 official wiki URL:https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_start_gcode": { "default_value": ";Official wiki URL for Geeetech M1:https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, "machine_width": { "default_value": 105 }, - "material_print_temperature": - { - "maximum_value": "230", - "value": "205 if speed_infill <=100 else 215 if speed_infill <= 150 else 220 if speed_infill <= 200 else 230" - }, - "retraction_amount": { "value": 1 }, + "material_bed_temperature": { "maximum_value": 60 }, + "material_print_temperature": { "maximum_value": 230 }, + "adhesion_type": { "value": "'brim'" }, + "brim_width": { "value": 2 }, + "retraction_amount": { "value": 2 }, "speed_print": { "maximum_value_warning": "200", diff --git a/resources/definitions/geeetech_M1S.def.json b/resources/definitions/geeetech_M1S.def.json new file mode 100644 index 0000000000..c2156a332e --- /dev/null +++ b/resources/definitions/geeetech_M1S.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Geeetech M1S", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 105 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 95 }, + "machine_name": { "default_value": "Geeetech M1S" }, + "machine_start_gcode": { "default_value": ";Official wiki URL for Geeetech M1S:https://www.geeetech.com/wiki/index.php/Geeetech_M1S_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 105 }, + "material_bed_temperature": { "maximum_value": 85 }, + "material_print_temperature": { "maximum_value": 250 }, + "adhesion_type": { "value": "'brim'" }, + "brim_width": { "value": 2 }, + "retraction_amount": { "value": 2 }, + "speed_print": + { + "maximum_value_warning": "200", + "value": 120 + }, + "speed_topbottom": + { + "maximum_value_warning": "200", + "value": 60 + }, + "speed_wall": + { + "maximum_value_warning": "200", + "value": 80 + }, + "speed_wall_0": + { + "maximum_value_warning": "200", + "value": 50 + }, + "speed_wall_x": + { + "maximum_value_warning": "200", + "value": 80 + } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index cc3e4044f8..3541a65bee 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -81,13 +81,12 @@ "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, "machine_name": { "default_value": "Geeetech Thunder" }, - "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_start_gcode": { "default_value": ";Official wiki URL for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_width": { "default_value": 250 }, "material_flow_layer_0": { "value": 95 }, "material_print_temperature": { - "maximum_value": "250", - "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220" + "maximum_value": "250" }, "material_print_temperature_layer_0": { diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg new file mode 100644 index 0000000000..2ed913b2a4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg new file mode 100644 index 0000000000..032e25592d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg new file mode 100644 index 0000000000..12306b7acc --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg new file mode 100644 index 0000000000..59db9afec4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg new file mode 100644 index 0000000000..ee92dc8c93 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg new file mode 100644 index 0000000000..0029d6101c --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg new file mode 100644 index 0000000000..225b0b3c06 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg index 2ab1f4dd00..77bf14e06e 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg index f2cd78d138..f9ecf2eec2 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg index aee452940d..e3c124c614 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg index dbd7e2a69c..5adccce2df 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg index 9c542b5fb2..f61f2febc0 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg index 628e670353..0677557124 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg index 7a7618760a..5df54b48df 100644 --- a/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg +++ b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] From c0a23e4f58097a709f510f60a8d6c867819b25b5 Mon Sep 17 00:00:00 2001 From: whoseyoung <78847564+whoseyoung@users.noreply.github.com> Date: Sat, 7 Jun 2025 09:02:39 +0000 Subject: [PATCH 20/31] Apply printer-linter format --- resources/definitions/geeetech_M1.def.json | 4 ++-- resources/definitions/geeetech_M1S.def.json | 4 ++-- resources/definitions/geeetech_Thunder.def.json | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json index 1bb0c5ce0c..2782c7c87c 100644 --- a/resources/definitions/geeetech_M1.def.json +++ b/resources/definitions/geeetech_M1.def.json @@ -9,6 +9,8 @@ }, "overrides": { + "adhesion_type": { "value": "'brim'" }, + "brim_width": { "value": 2 }, "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 105 }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, @@ -27,8 +29,6 @@ "machine_width": { "default_value": 105 }, "material_bed_temperature": { "maximum_value": 60 }, "material_print_temperature": { "maximum_value": 230 }, - "adhesion_type": { "value": "'brim'" }, - "brim_width": { "value": 2 }, "retraction_amount": { "value": 2 }, "speed_print": { diff --git a/resources/definitions/geeetech_M1S.def.json b/resources/definitions/geeetech_M1S.def.json index c2156a332e..79bfec5a89 100644 --- a/resources/definitions/geeetech_M1S.def.json +++ b/resources/definitions/geeetech_M1S.def.json @@ -9,6 +9,8 @@ }, "overrides": { + "adhesion_type": { "value": "'brim'" }, + "brim_width": { "value": 2 }, "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 105 }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, @@ -27,8 +29,6 @@ "machine_width": { "default_value": 105 }, "material_bed_temperature": { "maximum_value": 85 }, "material_print_temperature": { "maximum_value": 250 }, - "adhesion_type": { "value": "'brim'" }, - "brim_width": { "value": 2 }, "retraction_amount": { "value": 2 }, "speed_print": { diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index 3541a65bee..cf0f9dd5e9 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -84,10 +84,7 @@ "machine_start_gcode": { "default_value": ";Official wiki URL for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_width": { "default_value": 250 }, "material_flow_layer_0": { "value": 95 }, - "material_print_temperature": - { - "maximum_value": "250" - }, + "material_print_temperature": { "maximum_value": "250" }, "material_print_temperature_layer_0": { "maximum_value_warning": 300, From 23edebf6fd1eea9157a36994dc27b4b1853db6dd Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:23:34 +0200 Subject: [PATCH 21/31] [PP-639] Remove quality_definition for S8 This caused an infinite loop as it refers to itself --- resources/definitions/ultimaker_s8.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index fb8243cd60..05f1932ce1 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -48,7 +48,6 @@ "preferred_material": "ultimaker_pla_blue", "preferred_quality_type": "draft", "preferred_variant_name": "AA+ 0.4", - "quality_definition": "ultimaker_s8", "supported_actions": [ "DiscoverUM3Action" ], "supports_material_export": true, "supports_network_connection": true, From cbb9d992e9b3623e6f78b511b33ac75a9e34a111 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Tue, 10 Jun 2025 16:20:42 +0200 Subject: [PATCH 22/31] [PP-639] Inherit S8 from S5 i.s.o. S7 To prevent inheriting `quality_definition: ultimaker_s5` from the S7 --- resources/definitions/ultimaker_s8.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_s8.def.json b/resources/definitions/ultimaker_s8.def.json index 05f1932ce1..b7de27722d 100644 --- a/resources/definitions/ultimaker_s8.def.json +++ b/resources/definitions/ultimaker_s8.def.json @@ -1,7 +1,7 @@ { "version": 2, "name": "UltiMaker S8", - "inherits": "ultimaker_s7", + "inherits": "ultimaker_s5", "metadata": { "visible": true, From a8ab9ecb75c957419a5d3025fbb8bf0f57dbed43 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Tue, 10 Jun 2025 16:21:12 +0200 Subject: [PATCH 23/31] [PP-639] Move some setting overrides from S7 to S5 --- resources/definitions/ultimaker_s5.def.json | 7 ++++++- resources/definitions/ultimaker_s7.def.json | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 46d46d33eb..fa6f5a9a38 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -72,7 +72,11 @@ "brim_width": { "value": "3" }, "build_volume_temperature": { "maximum_value": 50 }, "cool_fan_speed": { "value": "50" }, - "default_material_print_temperature": { "value": "200" }, + "default_material_print_temperature": + { + "maximum_value_warning": "320", + "value": "200" + }, "extruder_prime_pos_abs": { "default_value": true }, "gantry_height": { "value": "55" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, @@ -104,6 +108,7 @@ "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, "machine_start_gcode": { "default_value": "" }, "machine_width": { "default_value": 330 }, + "material_print_temperature_layer_0": { "maximum_value_warning": "320" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_blob_enable": diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index 14d9b21168..ac2f927ad4 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -46,8 +46,6 @@ }, "overrides": { - "default_material_print_temperature": { "maximum_value_warning": "320" }, - "machine_name": { "default_value": "Ultimaker S7" }, - "material_print_temperature_layer_0": { "maximum_value_warning": "320" } + "machine_name": { "default_value": "Ultimaker S7" } } } \ No newline at end of file From f9c6d4aad1ea06a95dd064b2c6398a8d37ced57b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 12 Jun 2025 14:21:36 +0200 Subject: [PATCH 24/31] definition adjustments - If the machine has two extruder trains, they should be defined individually rather than reused from another machine, creates unnecessary linkage between machines. - Added "has_textured_buildplate" --- resources/definitions/biqu_b2.def.json | 3 ++- resources/extruders/biqu_b2_extruder_0.def.json | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 resources/extruders/biqu_b2_extruder_0.def.json diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index 3676ca8955..a5721d62d4 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -6,8 +6,9 @@ { "visible": true, "author": "Boris Juraga", + "has_textured_buildplate": true, "machine_extruder_trains": { - "0": "biqu_base_extruder_0", + "0": "biqu_b2_extruder_0", "1": "biqu_b2_extruder_1" }, "quality_definition": "biqu_b2" diff --git a/resources/extruders/biqu_b2_extruder_0.def.json b/resources/extruders/biqu_b2_extruder_0.def.json new file mode 100644 index 0000000000..4bfb9686b3 --- /dev/null +++ b/resources/extruders/biqu_b2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "biqu_b2", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file From 45f28184e530eb357d2029faebfb7ee3f2d85f36 Mon Sep 17 00:00:00 2001 From: HellAholic <28710690+HellAholic@users.noreply.github.com> Date: Thu, 12 Jun 2025 12:47:20 +0000 Subject: [PATCH 25/31] Apply printer-linter format --- resources/definitions/sovol_sv01.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/sovol_sv01.def.json b/resources/definitions/sovol_sv01.def.json index dd64702f7f..5c87d8124e 100644 --- a/resources/definitions/sovol_sv01.def.json +++ b/resources/definitions/sovol_sv01.def.json @@ -26,4 +26,4 @@ "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, "machine_width": { "default_value": 280 } } -} +} \ No newline at end of file From e028f044cb63bb1a73538064e67474032a926f78 Mon Sep 17 00:00:00 2001 From: HellAholic <28710690+HellAholic@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:18:47 +0000 Subject: [PATCH 26/31] Apply printer-linter format --- resources/extruders/toybox_alpha_one_two_extruder_0.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/toybox_alpha_one_two_extruder_0.def.json b/resources/extruders/toybox_alpha_one_two_extruder_0.def.json index cb39ebf85b..f7f773257c 100644 --- a/resources/extruders/toybox_alpha_one_two_extruder_0.def.json +++ b/resources/extruders/toybox_alpha_one_two_extruder_0.def.json @@ -10,8 +10,8 @@ "overrides": { "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -3.0 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": -3.0 } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file From ff0e12705e6c9006522e28dca54ec3353a924f1e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Thu, 12 Jun 2025 15:14:45 +0200 Subject: [PATCH 27/31] Update settings version Update variant setting version --- resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg | 2 +- resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg | 2 +- resources/variants/biqu/biqu_b2_0.2.inst.cfg | 2 +- resources/variants/biqu/biqu_b2_0.3.inst.cfg | 2 +- resources/variants/biqu/biqu_b2_0.4.inst.cfg | 2 +- resources/variants/biqu/biqu_b2_0.5.inst.cfg | 2 +- resources/variants/biqu/biqu_b2_0.6.inst.cfg | 2 +- resources/variants/biqu/biqu_b2_0.8.inst.cfg | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg index ef478ac259..b9f8323096 100644 --- a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_adaptive.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla_175 quality_type = adaptive -setting_version = 24 +setting_version = 25 type = quality variant = 0.4mm Nozzle diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg index 526aa6bdf2..57b48a55a5 100644 --- a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_draft.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla_175 quality_type = draft -setting_version = 24 +setting_version = 25 type = quality variant = 0.4mm Nozzle diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg index 8ee3e16ff4..d11d6658d4 100644 --- a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_low.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla_175 quality_type = low -setting_version = 24 +setting_version = 25 type = quality variant = 0.4mm Nozzle diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg index fd6ea4287d..fa641937bb 100644 --- a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_standard.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla_175 quality_type = standard -setting_version = 24 +setting_version = 25 type = quality variant = 0.4mm Nozzle diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg index 4d2899b599..7aadcb580c 100644 --- a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_super.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla_175 quality_type = super -setting_version = 24 +setting_version = 25 type = quality variant = 0.4mm Nozzle diff --git a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg index 247fdcf1a8..fbd8a08905 100644 --- a/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_0.4_PLA_ultra.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla_175 quality_type = ultra -setting_version = 24 +setting_version = 25 type = quality variant = 0.4mm Nozzle diff --git a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg index cd755a1cff..7f67567ef3 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = adaptive -setting_version = 24 +setting_version = 25 type = quality weight = -2 diff --git a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg index 92deadd38c..76cc7f73a0 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = draft -setting_version = 24 +setting_version = 25 type = quality weight = -5 diff --git a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg index 0455a6ec20..63a69c570e 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = low -setting_version = 24 +setting_version = 25 type = quality weight = -4 diff --git a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg index a0fb268e52..67b106a1ba 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = standard -setting_version = 24 +setting_version = 25 type = quality weight = -3 position = 0 diff --git a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg index fd54805c04..da7f8a363f 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = super -setting_version = 24 +setting_version = 25 type = quality weight = -1 diff --git a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg index cbc194ceb6..a3fc49ddbf 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = ultra -setting_version = 24 +setting_version = 25 type = quality weight = 0 diff --git a/resources/variants/biqu/biqu_b2_0.2.inst.cfg b/resources/variants/biqu/biqu_b2_0.2.inst.cfg index 8f7d063b93..e86b85d50b 100644 --- a/resources/variants/biqu/biqu_b2_0.2.inst.cfg +++ b/resources/variants/biqu/biqu_b2_0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/biqu/biqu_b2_0.3.inst.cfg b/resources/variants/biqu/biqu_b2_0.3.inst.cfg index e6381dfe80..8469c7e211 100644 --- a/resources/variants/biqu/biqu_b2_0.3.inst.cfg +++ b/resources/variants/biqu/biqu_b2_0.3.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/biqu/biqu_b2_0.4.inst.cfg b/resources/variants/biqu/biqu_b2_0.4.inst.cfg index 99958af88d..472e03489b 100644 --- a/resources/variants/biqu/biqu_b2_0.4.inst.cfg +++ b/resources/variants/biqu/biqu_b2_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/biqu/biqu_b2_0.5.inst.cfg b/resources/variants/biqu/biqu_b2_0.5.inst.cfg index 194e5a79c4..1ab4eb72d4 100644 --- a/resources/variants/biqu/biqu_b2_0.5.inst.cfg +++ b/resources/variants/biqu/biqu_b2_0.5.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/biqu/biqu_b2_0.6.inst.cfg b/resources/variants/biqu/biqu_b2_0.6.inst.cfg index 828843f658..0ac946844a 100644 --- a/resources/variants/biqu/biqu_b2_0.6.inst.cfg +++ b/resources/variants/biqu/biqu_b2_0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] diff --git a/resources/variants/biqu/biqu_b2_0.8.inst.cfg b/resources/variants/biqu/biqu_b2_0.8.inst.cfg index 8bc16cfade..53b6910342 100644 --- a/resources/variants/biqu/biqu_b2_0.8.inst.cfg +++ b/resources/variants/biqu/biqu_b2_0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 24 +setting_version = 25 type = variant [values] From 8188207cd23acb85bb77d1f09c44f380fb36ca24 Mon Sep 17 00:00:00 2001 From: HellAholic <28710690+HellAholic@users.noreply.github.com> Date: Thu, 12 Jun 2025 14:12:54 +0000 Subject: [PATCH 28/31] Apply printer-linter format --- resources/definitions/biqu_b2.def.json | 13 +++++++------ .../biqu/b2/biqu_b2_global_adaptive.inst.cfg | 9 +++++---- .../quality/biqu/b2/biqu_b2_global_draft.inst.cfg | 9 +++++---- .../quality/biqu/b2/biqu_b2_global_low.inst.cfg | 9 +++++---- .../biqu/b2/biqu_b2_global_standard.inst.cfg | 11 ++++++----- .../quality/biqu/b2/biqu_b2_global_super.inst.cfg | 9 +++++---- .../quality/biqu/b2/biqu_b2_global_ultra.inst.cfg | 9 +++++---- 7 files changed, 38 insertions(+), 31 deletions(-) diff --git a/resources/definitions/biqu_b2.def.json b/resources/definitions/biqu_b2.def.json index a5721d62d4..85139b82c1 100644 --- a/resources/definitions/biqu_b2.def.json +++ b/resources/definitions/biqu_b2.def.json @@ -7,7 +7,8 @@ "visible": true, "author": "Boris Juraga", "has_textured_buildplate": true, - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "biqu_b2_extruder_0", "1": "biqu_b2_extruder_1" }, @@ -16,7 +17,11 @@ "overrides": { "gantry_height": { "value": 27.5 }, + "machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y{machine_depth}\n;END OF CUSTOM END GCODE" }, "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 }, "machine_head_with_fans_polygon": { "default_value": [ @@ -26,13 +31,9 @@ [33, 35] ] }, - "machine_end_gcode": { "default_value": ";BEGIN OF CUSTOM END GCODE\nM104 S0\nM140 S0\n;Retract the filament\nG91\nG1 E-30 F300\nG1 Z5\nG90\nG28 X0 Y{machine_depth}\n;END OF CUSTOM END GCODE" }, "machine_name": { "default_value": "BIQU B2" }, "machine_start_gcode": { "default_value": ";BEGIN OF CUSTOM START GCODE\nG28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nT1\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X6.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X6.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X6.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X6.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X6.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X6.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X7.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X7.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X7.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X7.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nG92 E0 \nT1\nG92 E0\nG1 F1200 E-30\nG92 E0\nT0\nG92 E0\nG1 F1200 E30\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X9.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X9.1 Y200.0 Z0.3 F1500.0 E10 ; Draw the first line\nG1 X9.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X9.4 Y20 Z0.3 F1500.0 E20 ; Draw the second line\nG1 X9.7 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X9.7 Y200.0 Z0.3 F1500.0 E30 ; Draw the three line\nG1 X10.0 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X10.0 Y20 Z0.3 F1500.0 E40 ; Draw the four line\nG1 X10.3 Y20 Z0.3 F5000.0 ; Move to side a little\nG1 X10.3 Y200.0 Z0.3 F1500.0 E50 ; Draw the four line\nT0\nG92 E0\nG1 F1200 E-30\nG92 E0\nG92 E0\nT{initial_extruder_nr} ; RESET EXTRUDER TO INITIAL\n; start print\n;END OF CUSTOM START GCODE" }, - "machine_extruders_share_heater": { "default_value": true }, - "machine_extruders_share_nozzle": { "default_value": true }, - "machine_extruders_shared_nozzle_initial_retraction": { "default_value": 30 }, "prime_tower_enable": { "default_value": true }, - "prime_tower_mode": { "default_value": "interleaved" } + "prime_tower_mode": { "default_value": "interleaved" } } } \ No newline at end of file diff --git a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg index 7f67567ef3..54484e046e 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_adaptive.inst.cfg @@ -14,15 +14,16 @@ weight = -2 adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 -support_interface_height = =layer_height*6 -top_bottom_thickness = =layer_height_0+layer_height*4 -wall_thickness = =line_width*3 material_final_print_temperature = 195 material_initial_print_temperature = 195 material_print_temperature = 190 material_standby_temperature = 195 optimize_wall_printing_order = True prime_tower_min_volume = 150 +support_interface_height = =layer_height*6 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 \ No newline at end of file +switch_extruder_retraction_speeds = 30 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg index 76cc7f73a0..e5ebe77ad2 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_draft.inst.cfg @@ -13,15 +13,16 @@ weight = -5 [values] layer_height = 0.32 layer_height_0 = 0.32 -support_interface_height = =layer_height*4 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 material_final_print_temperature = 195 material_initial_print_temperature = 195 material_print_temperature = 190 material_standby_temperature = 195 optimize_wall_printing_order = True prime_tower_min_volume = 150 +support_interface_height = =layer_height*4 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 \ No newline at end of file +switch_extruder_retraction_speeds = 30 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg index 63a69c570e..2a0f57981f 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_low.inst.cfg @@ -13,15 +13,16 @@ weight = -4 [values] layer_height = 0.28 layer_height_0 = 0.28 -support_interface_height = =layer_height*4 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*3 material_final_print_temperature = 195 material_initial_print_temperature = 195 material_print_temperature = 190 material_standby_temperature = 195 optimize_wall_printing_order = True prime_tower_min_volume = 150 +support_interface_height = =layer_height*4 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 \ No newline at end of file +switch_extruder_retraction_speeds = 30 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg index 67b106a1ba..e2860c23e3 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_standard.inst.cfg @@ -5,24 +5,25 @@ version = 4 [metadata] global_quality = True +position = 0 quality_type = standard setting_version = 25 type = quality weight = -3 -position = 0 [values] layer_height = 0.2 layer_height_0 = 0.2 -support_interface_height = =layer_height*4 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*3 material_final_print_temperature = 195 material_initial_print_temperature = 195 material_print_temperature = 190 material_standby_temperature = 195 optimize_wall_printing_order = True prime_tower_min_volume = 150 +support_interface_height = =layer_height*4 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 \ No newline at end of file +switch_extruder_retraction_speeds = 30 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg index da7f8a363f..9343fe00df 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_super.inst.cfg @@ -13,15 +13,16 @@ weight = -1 [values] layer_height = 0.12 layer_height_0 = 0.12 -support_interface_height = =layer_height*8 -top_bottom_thickness = =layer_height_0+layer_height*6 -wall_thickness = =line_width*3 material_final_print_temperature = 195 material_initial_print_temperature = 195 material_print_temperature = 190 material_standby_temperature = 195 optimize_wall_printing_order = True prime_tower_min_volume = 150 +support_interface_height = =layer_height*8 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 \ No newline at end of file +switch_extruder_retraction_speeds = 30 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg index a3fc49ddbf..4625e672e3 100644 --- a/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg +++ b/resources/quality/biqu/b2/biqu_b2_global_ultra.inst.cfg @@ -13,15 +13,16 @@ weight = 0 [values] layer_height = 0.08 layer_height_0 = 0.12 -support_interface_height = =layer_height*12 -top_bottom_thickness = =layer_height_0+layer_height*10 -wall_thickness = =line_width*4 material_final_print_temperature = 195 material_initial_print_temperature = 195 material_print_temperature = 190 material_standby_temperature = 195 optimize_wall_printing_order = True prime_tower_min_volume = 150 +support_interface_height = =layer_height*12 switch_extruder_prime_speed = 10 switch_extruder_retraction_amount = 40 -switch_extruder_retraction_speeds = 30 \ No newline at end of file +switch_extruder_retraction_speeds = 30 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*4 + From 95227a59fdcad88b95785361f5473ec6f99010c9 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 13 Jun 2025 11:27:36 +0200 Subject: [PATCH 29/31] Add v2 buildplate texture for hidra and hidra plus --- resources/definitions/hellbot_hidra.def.json | 2 +- .../definitions/hellbot_hidra_plus.def.json | 2 +- resources/definitions/hellbot_magna_SE.def.json | 6 +++--- .../definitions/hellbot_magna_SE_Pro.def.json | 4 ++-- .../images/Hellbot_Hidra_and_Hidra_Plus_V2.png | Bin 0 -> 13726 bytes 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 resources/images/Hellbot_Hidra_and_Hidra_Plus_V2.png diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json index fe1d580354..bf8eb16608 100644 --- a/resources/definitions/hellbot_hidra.def.json +++ b/resources/definitions/hellbot_hidra.def.json @@ -21,7 +21,7 @@ 0, 5 ], - "platform_texture": "hellbot_hidra.png" + "platform_texture": "Hellbot_Hidra_and_Hidra_Plus_V2.png" }, "overrides": { diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json index dc718dc5f2..70938b5b00 100644 --- a/resources/definitions/hellbot_hidra_plus.def.json +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -21,7 +21,7 @@ 0, 5 ], - "platform_texture": "hellbot_hidra_plus.png" + "platform_texture": "Hellbot_Hidra_and_Hidra_Plus_V2.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index a449a60f01..7f36c24525 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -8,11 +8,11 @@ "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", - "platform": "hellbot_magna_SE.obj", + "platform": "Hellbot_Magna_SE.obj", "has_materials": true, "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, - "platform_texture": "hellbot_magna_SE.png" + "platform_texture": "Hellbot_Magna_SE.png" }, "overrides": { @@ -24,4 +24,4 @@ "machine_name": { "default_value": "Hellbot Magna SE" }, "machine_width": { "default_value": 230 } } -} \ No newline at end of file +} diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index aa71aab37b..eb3120b9ed 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -12,7 +12,7 @@ "has_materials": true, "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" }, - "platform_texture": "Hellbot_magna_SE_Pro.png" + "platform_texture": "Hellbot_Magna_SE_Pro.png" }, "overrides": { @@ -24,4 +24,4 @@ "machine_name": { "default_value": "Hellbot Magna SE Pro" }, "machine_width": { "default_value": 230 } } -} \ No newline at end of file +} diff --git a/resources/images/Hellbot_Hidra_and_Hidra_Plus_V2.png b/resources/images/Hellbot_Hidra_and_Hidra_Plus_V2.png new file mode 100644 index 0000000000000000000000000000000000000000..1cbdea4aae04bfa83f43f67b59ae3091d1d6d5d7 GIT binary patch literal 13726 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 literal 0 HcmV?d00001 From 0d06822e1b9aaefe2d42f3e3f531eadb927a0b2c Mon Sep 17 00:00:00 2001 From: HellAholic <28710690+HellAholic@users.noreply.github.com> Date: Fri, 13 Jun 2025 09:29:06 +0000 Subject: [PATCH 30/31] Apply printer-linter format --- resources/definitions/hellbot_magna_SE.def.json | 2 +- resources/definitions/hellbot_magna_SE_Pro.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index 7f36c24525..0248b0caf2 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -24,4 +24,4 @@ "machine_name": { "default_value": "Hellbot Magna SE" }, "machine_width": { "default_value": 230 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index eb3120b9ed..cb13626121 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -24,4 +24,4 @@ "machine_name": { "default_value": "Hellbot Magna SE Pro" }, "machine_width": { "default_value": 230 } } -} +} \ No newline at end of file From 2663d8eaceb1ac79a229da230c5857e4bee7c787 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 13 Jun 2025 16:32:40 +0200 Subject: [PATCH 31/31] capitalization .git ignores the capitalization on the repository so the assets rename did not update their capitalization. This fixes the unit tests --- resources/definitions/hellbot_magna_SE.def.json | 4 ++-- resources/definitions/hellbot_magna_SE_Pro.def.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index 0248b0caf2..a449a60f01 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -8,11 +8,11 @@ "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", - "platform": "Hellbot_Magna_SE.obj", + "platform": "hellbot_magna_SE.obj", "has_materials": true, "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, - "platform_texture": "Hellbot_Magna_SE.png" + "platform_texture": "hellbot_magna_SE.png" }, "overrides": { diff --git a/resources/definitions/hellbot_magna_SE_Pro.def.json b/resources/definitions/hellbot_magna_SE_Pro.def.json index cb13626121..aa71aab37b 100644 --- a/resources/definitions/hellbot_magna_SE_Pro.def.json +++ b/resources/definitions/hellbot_magna_SE_Pro.def.json @@ -12,7 +12,7 @@ "has_materials": true, "has_textured_buildplate": true, "machine_extruder_trains": { "0": "hellbot_magna_SE_Pro_extruder" }, - "platform_texture": "Hellbot_Magna_SE_Pro.png" + "platform_texture": "Hellbot_magna_SE_Pro.png" }, "overrides": {