diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json index b0e7e08754..0dbd4f9604 100644 --- a/resources/profiles/Voron.json +++ b/resources/profiles/Voron.json @@ -16,6 +16,18 @@ "name": "Voron 2.4 350", "sub_path": "machine/Voron 2.4 350.json" }, + { + "name": "Voron Trident 250", + "sub_path": "machine/Voron Trident 250.json" + }, + { + "name": "Voron Trident 300", + "sub_path": "machine/Voron Trident 300.json" + }, + { + "name": "Voron Trident 350", + "sub_path": "machine/Voron Trident 350.json" + }, { "name": "Voron 0.1", "sub_path": "machine/Voron 0.1.json" @@ -138,10 +150,6 @@ "name": "fdm_machine_common", "sub_path": "machine/fdm_machine_common.json" }, - { - "name": "fdm_bbl_3dp_001_common", - "sub_path": "machine/fdm_bbl_3dp_001_common.json" - }, { "name": "fdm_klipper_common", "sub_path": "machine/fdm_klipper_common.json" @@ -158,6 +166,18 @@ "name": "Voron 2.4 350 0.4 nozzle", "sub_path": "machine/Voron 2.4 350 0.4 nozzle.json" }, + { + "name": "Voron Trident 250 0.4 nozzle", + "sub_path": "machine/Voron Trident 250 0.4 nozzle.json" + }, + { + "name": "Voron Trident 300 0.4 nozzle", + "sub_path": "machine/Voron Trident 300 0.4 nozzle.json" + }, + { + "name": "Voron Trident 350 0.4 nozzle", + "sub_path": "machine/Voron Trident 350 0.4 nozzle.json" + }, { "name": "Voron 0.1 0.4 nozzle", "sub_path": "machine/Voron 0.1 0.4 nozzle.json" diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json index 275717c12f..6478b01db1 100644 --- a/resources/profiles/Voron/filament/Voron Generic ABS.json +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -10,12 +10,15 @@ "0.95" ], "filament_max_volumetric_speed": [ - "16" + "12" ], "compatible_printers": [ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json index 6532a958ff..5ac4e96a8b 100644 --- a/resources/profiles/Voron/filament/Voron Generic ASA.json +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -16,6 +16,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json index ce0eaacc2e..bae64a95a7 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -18,9 +18,13 @@ "filament_max_volumetric_speed": [ "8" ], - "compatible_printers": [ +"compatible_printers": [ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json index 91183f44cc..51bddeab23 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA.json +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -13,11 +13,15 @@ "280" ], "filament_max_volumetric_speed": [ - "16" + "12" ], - "compatible_printers": [ +"compatible_printers": [ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json index fbb1dbec89..798d28c2f3 100644 --- a/resources/profiles/Voron/filament/Voron Generic PC.json +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -7,14 +7,18 @@ "instantiation": "true", "inherits": "fdm_filament_pc", "filament_max_volumetric_speed": [ - "16" + "12" ], "filament_flow_ratio": [ "0.94" ], - "compatible_printers": [ +"compatible_printers": [ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json index a5d8a3c86d..cf7ccb23a3 100644 --- a/resources/profiles/Voron/filament/Voron Generic PETG.json +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -46,6 +46,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json index c29a8c756c..be4304d051 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -18,9 +18,13 @@ "slow_down_layer_time": [ "7" ], - "compatible_printers": [ +"compatible_printers": [ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle" + "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", + "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json index 11ec23f635..9655890e69 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -19,6 +19,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json index aea789aa8b..5ed8fd05ca 100644 --- a/resources/profiles/Voron/filament/Voron Generic PVA.json +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -10,7 +10,7 @@ "0.95" ], "filament_max_volumetric_speed": [ - "16" + "12" ], "slow_down_layer_time": [ "7" @@ -22,6 +22,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json index 63d00e9983..2d96fd0065 100644 --- a/resources/profiles/Voron/filament/Voron Generic TPU.json +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -13,6 +13,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json index 031c9248ae..765e736a44 100644 --- a/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json @@ -1,21 +1,12 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-001", "name": "Voron 0.1 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_bbl_3dp_001_common", + "inherits": "fdm_klipper_common", "printer_model": "Voron 0.1", - "default_filament_profile": [ - "Bambu PLA Basic @BBL X1" - ], "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], "printable_area": [ "0x0", "120x0", @@ -23,11 +14,6 @@ "0x120" ], "printable_height": "120", - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "scan_first_layer": "0", - "machine_load_filament_time": "17", - "machine_unload_filament_time": "16", "nozzle_type": "hardened_steel", "auxiliary_fan": "0" } diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json index 00a7d6440c..9397c8a97c 100644 --- a/resources/profiles/Voron/machine/Voron 0.1.json +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "voron_logo.png", "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Voron Generic ABS" + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json index ad09c74467..dbab438342 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-002", "name": "Voron 2.4 250 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json index a10664e40f..fafa8447ce 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "voron_logo.png", "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Voron Generic ABS" + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json index 630da11a0d..3c87e6834d 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-003", "name": "Voron 2.4 300 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json index 67acff7c6f..73d4cf4ea3 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "voron_logo.png", "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Voron Generic ABS" + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" } diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json index 30dffc5dbf..ab01c08745 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM003", + "setting_id": "VORON-004", "name": "Voron 2.4 350 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json index c82b1c82af..0612a51896 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "voron_logo.png", "hotend_model": "bbl-3dp-hotend.stl", - "default_materials": "Voron Generic ABS" + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" } diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json new file mode 100644 index 0000000000..0cc47cefdf --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "machine", + "setting_id": "VORON-005", + "name": "Voron Trident 250 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 2.4 250", + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "225" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json new file mode 100644 index 0000000000..1739b6fc66 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron Trident 250", + "model_id": "Voron2Trident-250", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json new file mode 100644 index 0000000000..0fe915703f --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "machine", + "setting_id": "VORON-006", + "name": "Voron Trident 300 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 2.4 300", + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "275" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json new file mode 100644 index 0000000000..2e21f197b2 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron Trident 300", + "model_id": "Voron2Trident-300", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json new file mode 100644 index 0000000000..17767c58d2 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "machine", + "setting_id": "VORON-007", + "name": "Voron Trident 350 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 2.4 350", + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "325" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json new file mode 100644 index 0000000000..a6923f58af --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Voron Trident 350", + "model_id": "Voron2Trident-350", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "VoronDesign", + "bed_model": "", + "bed_texture": "voron_logo.png", + "hotend_model": "bbl-3dp-hotend.stl", + "default_materials": "Voron Generic ABS; Voron Generic PLA; Voron Generic PLA-CF; Voron Generic PETG; Voron Generic TPU; Voron Generic ASA; Voron Generic PC; Voron Generic PVA; Voron Generic PA; Voron Generic PA-CF" +} diff --git a/resources/profiles/Voron/machine/fdm_bbl_3dp_001_common.json b/resources/profiles/Voron/machine/fdm_bbl_3dp_001_common.json deleted file mode 100644 index 262aa2490a..0000000000 --- a/resources/profiles/Voron/machine/fdm_bbl_3dp_001_common.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "type": "machine", - "name": "fdm_bbl_3dp_001_common", - "from": "system", - "instantiation": "false", - "printable_area": [ - "0x0", - "256x0", - "256x256", - "0x256" - ], - "bed_exclude_area": [ - "0x0", - "28x0", - "28x28", - "0x28", - "0x28", - "8x28", - "8x256", - "0x256" - ], - "default_filament_profile": [ - "Voron Generic ABS" - ], - "default_print_profile": "0.20mm Standard @Voron", - "deretraction_speed": [ - "0" - ], - "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600 ; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90\nG0 X110 Y200 F3600", - "extruder_colour": [ - "#018001" - ], - "extruder_offset": [ - "0x0" - ], - "gcode_flavor": "marlin", - "inherits": "fdm_machine_common", - "machine_max_acceleration_e": [ - "5000", - "5000" - ], - "machine_max_acceleration_extruding": [ - "20000", - "20000" - ], - "machine_max_acceleration_retracting": [ - "5000", - "5000" - ], - "machine_max_acceleration_travel": [ - "9000", - "9000" - ], - "machine_max_acceleration_x": [ - "20000", - "20000" - ], - "machine_max_acceleration_y": [ - "20000", - "20000" - ], - "machine_max_acceleration_z": [ - "500", - "200" - ], - "machine_max_speed_e": [ - "25", - "25" - ], - "machine_max_speed_x": [ - "500", - "200" - ], - "machine_max_speed_y": [ - "500", - "200" - ], - "machine_max_speed_z": [ - "12", - "12" - ], - "machine_max_jerk_e": [ - "2.5", - "2.5" - ], - "machine_max_jerk_x": [ - "9", - "9" - ], - "machine_max_jerk_y": [ - "9", - "9" - ], - "machine_max_jerk_z": [ - "0.2", - "0.4" - ], - "machine_min_extruding_rate": [ - "0", - "0" - ], - "machine_min_travel_rate": [ - "0", - "0" - ], - "max_layer_height": [ - "0.28" - ], - "min_layer_height": [ - "0.08" - ], - "printable_height": "250", - "extruder_clearance_radius": "65", - "extruder_clearance_height_to_rod": "36", - "extruder_clearance_height_to_lid": "140", - "nozzle_diameter": [ - "0.4" - ], - "printer_settings_id": "", - "printer_technology": "FFF", - "printer_variant": "0.4", - "retraction_minimum_travel": [ - "1" - ], - "retract_before_wipe": [ - "70%" - ], - "retract_when_changing_layer": [ - "1" - ], - "retraction_length": [ - "0.8" - ], - "retract_length_toolchange": [ - "2" - ], - "z_hop": [ - "0.4" - ], - "retract_restart_extra": [ - "0" - ], - "retract_restart_extra_toolchange": [ - "0" - ], - "retraction_speed": [ - "30" - ], - "deretraction_speed": [ - "30" - ], - "silent_mode": "0", - "single_extruder_multi_material": "1", - "change_filament_gcode": "M620 S[next_extruder]A\nM204 S9000\n{if toolchange_count > 1}\nG17\nG2 Z{max_layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\n{endif}\nG1 Z{max_layer_z + 3.0} F1200\n\nG1 X70 F12000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\n{if old_filament_temp > 0 && next_extruder < 255}M109 S[old_filament_temp]{endif}\nG1 X90 F3000\nG1 Y250 F4000\nG1 X100 F5000\nG1 X120 F12000\n\nG1 X20 Y50 F12000\nG1 Y-3\n\nT[next_extruder]\n\n; always use highest temperature to flush\nM400\nM109 S[nozzle_temperature_range_high]\n\n{if next_extruder < 255}\nG1 X54 F12000\nG1 Y265\n\nM400\n\nG92 E0\n{if flush_length_1 > 1}\n; FLUSH_START\n{if flush_length_1 > 23.7}\nG1 E23.7 F{old_filament_e_feedrate} ; do not need pulsatile flushing for start part\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{old_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\n{else}\nG1 E{flush_length_1} F{old_filament_e_feedrate}\n{endif}\n; FLUSH_END\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_2 > 1}\n; FLUSH_START\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_3 > 1}\n; FLUSH_START\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_4 > 1}\n; FLUSH_START\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n; FLUSH_END\n{endif}\n\nM400\nM109 S[new_filament_temp]\n\nM400\nM106 P1 S255\nM400 S3\nG1 X80 F15000\nG1 X60 F15000\nG1 X80 F15000\nG1 X60 F15000; shake to put down garbage\n\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\n\nG1 X70 F5000\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 Y265 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X165 F15000; wipe and shake\nG1 Y256 ; move Y to aside, prevent collision\nM400\nG1 Z[z_after_toolchange] F3000\n{if layer_z <= (initial_layer_print_height + 0.001)}\nM204 S[initial_layer_acceleration]\n{else}\nM204 S[default_acceleration]\n{endif}\n{else}\nG1 X[x_after_toolchange] Y[y_after_toolchange] Z[z_after_toolchange] F12000\n{endif}\nM621 S[next_extruder]A", - "layer_change_gcode": "{if timelapse_no_toolhead}\nG92 E0\nG1 E-[retraction_length] F1800\nG1 X65 Y245 F12000 ; move to safe pos\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}", - "machine_pause_gcode": "M400 U1\n", - "wipe": [ - "1" - ] -} diff --git a/resources/profiles/Voron/machine/fdm_klipper_common.json b/resources/profiles/Voron/machine/fdm_klipper_common.json index cce239a83e..33dd12051d 100644 --- a/resources/profiles/Voron/machine/fdm_klipper_common.json +++ b/resources/profiles/Voron/machine/fdm_klipper_common.json @@ -1,24 +1,142 @@ { - "type": "machine", - "name": "fdm_klipper_common", - "from": "system", - "instantiation": "false", - "inherits": "fdm_bbl_3dp_001_common", - "default_filament_profile": [ - "Voron Generic ABS" - ], - "default_print_profile": "0.20mm Standard @Voron", - "nozzle_diameter": [ - "0.4" - ], - "bed_exclude_area": [ - "0x0" - ], - "machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "PRINT_END", - "layer_change_gcode": "", - "scan_first_layer": "0", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "0" - } - \ No newline at end of file + "type": "machine", + "name": "fdm_klipper_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "200" + ], + "machine_max_speed_e": [ + "25", + "25" + ], + "machine_max_speed_x": [ + "500", + "200" + ], + "machine_max_speed_y": [ + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4" + ], + "machine_min_extruding_rate": [ + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0" + ], + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "printable_height": "250", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retraction_minimum_travel": [ + "1" + ], + "retract_before_wipe": [ + "70%" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "0.8" + ], + "retract_length_toolchange": [ + "2" + ], + "z_hop": [ + "0.4" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retraction_speed": [ + "30" + ], + "deretraction_speed": [ + "30" + ], + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "machine_pause_gcode": "PAUSE\n", + "wipe": [ + "1" + ], + "default_filament_profile": [ + "Voron Generic ABS" + ], + "default_print_profile": "0.20mm Standard @Voron", + "nozzle_diameter": [ + "0.4" + ], + "bed_exclude_area": [ + "0x0" + ], + "machine_start_gcode": "M190 S0\nM104 S0\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": "", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json b/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json index 6269c2334c..b456342d93 100644 --- a/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json +++ b/resources/profiles/Voron/process/0.20mm Bambu Support W @Voron.json @@ -27,6 +27,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/process/fdm_process_voron_common.json b/resources/profiles/Voron/process/fdm_process_voron_common.json index cd27ff5b5d..47de08ca08 100644 --- a/resources/profiles/Voron/process/fdm_process_voron_common.json +++ b/resources/profiles/Voron/process/fdm_process_voron_common.json @@ -103,6 +103,9 @@ "Voron 2.4 250 0.4 nozzle", "Voron 2.4 300 0.4 nozzle", "Voron 2.4 350 0.4 nozzle", + "Voron Trident 250 0.4 nozzle", + "Voron Trident 300 0.4 nozzle", + "Voron Trident 350 0.4 nozzle", "Voron 0.1 0.4 nozzle" ] } diff --git a/resources/profiles/Voron/voron_logo.png b/resources/profiles/Voron/voron_logo.png index ba814c9c5d..26b745a877 100644 Binary files a/resources/profiles/Voron/voron_logo.png and b/resources/profiles/Voron/voron_logo.png differ diff --git a/resources/web/image/printer/Voron Trident 250_cover.png b/resources/web/image/printer/Voron Trident 250_cover.png new file mode 100644 index 0000000000..8357a65a13 Binary files /dev/null and b/resources/web/image/printer/Voron Trident 250_cover.png differ diff --git a/resources/web/image/printer/Voron Trident 300_cover.png b/resources/web/image/printer/Voron Trident 300_cover.png new file mode 100644 index 0000000000..8357a65a13 Binary files /dev/null and b/resources/web/image/printer/Voron Trident 300_cover.png differ diff --git a/resources/web/image/printer/Voron Trident 350_cover.png b/resources/web/image/printer/Voron Trident 350_cover.png new file mode 100644 index 0000000000..8357a65a13 Binary files /dev/null and b/resources/web/image/printer/Voron Trident 350_cover.png differ