From eae3790cd3925e830bb7fa25d1af3c15f1a49b0a Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sun, 7 Dec 2025 21:06:55 +0100 Subject: [PATCH] changed: change_filament_gcode --- OrcaSlicer.conf | 55 +++++++++++-------- .../machine/KlipperS1Pro_klipper.json | 3 +- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/OrcaSlicer.conf b/OrcaSlicer.conf index 882ba3f..996adea 100644 --- a/OrcaSlicer.conf +++ b/OrcaSlicer.conf @@ -28,7 +28,7 @@ "is_split_compound": false, "keyboard_supported": "none/alt/control/shift", "language": "en_US", - "last_backup_path": "/tmp/orcaslicer_model/Sun_Dec_07/20_49_09#2#42", + "last_backup_path": "/tmp/orcaslicer_model/Sun_Dec_07/21_05_16#2#58", "last_export_path": "/home/jens/Downloads", "legacy_networking": true, "linear_defletion": "0.003", @@ -160,11 +160,11 @@ { "curr_bed_type": "3", "filament": "Generic PLA @System", - "filament_colors": "#E7CFAC", + "filament_colors": "#F9F06B", "flush_volumes_matrix": "0.000000", "flush_volumes_vector": "140.000000|140.000000", "machine": "Creality Ender-3 S1 Pro 0.4 nozzle", - "process": "0.20mm Standard @Creality Ender3S1Pro" + "process": "Default Setting" }, { "curr_bed_type": "3", @@ -283,6 +283,15 @@ "machine": "Creality Ender-3 S1 Pro ND=0.6(Vase-3-150.3mf)", "process": "LH=0.28, ND=0.6, SP=Std @Creality Ender3S1Pro(Vase-3-150.3mf)" }, + { + "curr_bed_type": "3", + "filament": "PolyTerra PLA @System", + "filament_colors": "#F9F06B", + "flush_volumes_matrix": "0.000000", + "flush_volumes_vector": "140.000000|140.000000", + "machine": "Creality Ender-3 S1 Pro ND=0.6(Vase-3-150.3mf)a", + "process": "Default Setting" + }, { "curr_bed_type": "3", "filament": "Default Filament", @@ -438,28 +447,28 @@ "timelapse": "1" }, "recent": { - "last_opened_folder": "/home/jens/3dp", + "last_opened_folder": "/home/jens/3dp/Vase", "printhost_path": "", - "settings_folder": "/home/jens/3dp" + "settings_folder": "/home/jens/3dp/Vase" }, "recent_projects": { - "01": "/home/jens/3dp/Camera Housing.3mf", - "02": "/home/jens/Downloads/Vase-3-150.3mf", - "03": "/home/jens/Downloads/Vase-2-150.3mf", - "04": "/home/jens/Downloads/Vase-1-150.3mf", - "05": "/home/jens/Downloads/Vase-1-150_KlipperS1Pro.3mf", - "06": "/home/jens/3dp/xyzCalibration_cube_orca.3mf", - "07": "/home/jens/3dp/3dbrenchy_orca.3mf", - "08": "/home/jens/Downloads/Vase 1(2).3mf", - "09": "/home/jens/Downloads/Vase 1(1).3mf", - "10": "/home/jens/Downloads/Vase 1.3mf", - "11": "/home/jens/3dp/a1-wiper-for-ender-3-bracket.3mf", - "12": "/home/jens/Downloads/BoschSmartSystemAdapter.3mf", - "13": "/home/jens/3dp/VFA test.3mf", - "14": "/home/jens/3dp/Benchmark_Bot_KaziToad.3mf", - "15": "/home/jens/3dp/sphere.3mf", - "16": "/home/jens/3dp/Flowrate Test - Pass2.3mf", - "17": "/home/jens/3dp/OrcaToleranceTest.3mf", - "18": "/home/jens/3dp/Flowrate Test - Pass_prusa1.3mf" + "01": "/home/jens/3dp/Vase/Vase-3-150.3mf", + "02": "/home/jens/3dp/Camera Housing.3mf", + "03": "/home/jens/Downloads/Vase-3-150.3mf", + "04": "/home/jens/Downloads/Vase-2-150.3mf", + "05": "/home/jens/Downloads/Vase-1-150.3mf", + "06": "/home/jens/Downloads/Vase-1-150_KlipperS1Pro.3mf", + "07": "/home/jens/3dp/xyzCalibration_cube_orca.3mf", + "08": "/home/jens/3dp/3dbrenchy_orca.3mf", + "09": "/home/jens/Downloads/Vase 1(2).3mf", + "10": "/home/jens/Downloads/Vase 1(1).3mf", + "11": "/home/jens/Downloads/Vase 1.3mf", + "12": "/home/jens/3dp/a1-wiper-for-ender-3-bracket.3mf", + "13": "/home/jens/Downloads/BoschSmartSystemAdapter.3mf", + "14": "/home/jens/3dp/VFA test.3mf", + "15": "/home/jens/3dp/Benchmark_Bot_KaziToad.3mf", + "16": "/home/jens/3dp/sphere.3mf", + "17": "/home/jens/3dp/Flowrate Test - Pass2.3mf", + "18": "/home/jens/3dp/OrcaToleranceTest.3mf" } } diff --git a/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json b/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json index bca90df..0f92b7e 100644 --- a/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json +++ b/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json @@ -140,8 +140,9 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nG28 ; home all axis and restore leveling\nG1 Z50 F240\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 X0 Y10 F3000\nG1 Z1.0 F240\nG1 X100 F5000\nG1 Z0.28 F240\nG1 X2.0 E10 F1500 ; prime the nozzle\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X3.3 Y140 F5000\nG92 E0\nG1 X3.3 Y20 E10 F1200 ; prime the nozzle\nG92 E0\n", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "change_filament_gcode": "M600", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", - "machine_pause_gcode": "PAUSE", + "machine_pause_gcode": "M25", "scan_first_layer": "0", "nozzle_type": "undefine", "auxiliary_fan": "0"