From a96aad1fda09945eb3e93c3f68ca534d3840a7da Mon Sep 17 00:00:00 2001
From: Bhall338 <23674868+brandonfhall@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:53:14 -0500
Subject: [PATCH] 7607 k2plus filament change gcode (#7713)

* added change g-code

* adjusted change_filament_gcode for all k2 profiles

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* removed extra space on new line characters. to exeactly match creality print

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* disabled filamanet ramming and cleared Single Extruder Paramaters

* Merge branch '7607-k2plus-filament-change-gcode' of https://github.com/brandonfhall/OrcaSlicer into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode

* Merge branch 'main' into 7607-k2plus-filament-change-gcode
---
 .../Creality/machine/Creality K2 Plus 0.2 nozzle.json       | 6 ++++++
 .../Creality/machine/Creality K2 Plus 0.4 nozzle.json       | 6 ++++++
 .../Creality/machine/Creality K2 Plus 0.6 nozzle.json       | 6 ++++++
 .../Creality/machine/Creality K2 Plus 0.8 nozzle.json       | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json
index b88686c8c2..dccdf656fa 100644
--- a/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json	
@@ -108,6 +108,11 @@
     "deretraction_speed": [
         "40"
     ],
+    "enable_filament_ramming": "0",
+    "cooling_tube_length": "0",
+    "cooling_tube_retraction": "0",
+    "parking_pos_retraction": "0",
+    "extra_loading_move": "0",
     "extruder_clearance_height_to_lid": "118",
     "extruder_clearance_height_to_rod": "24",
     "extruder_clearance_radius": "64",
@@ -125,6 +130,7 @@
     "machine_start_gcode":"M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F1500\nG1 X150 Y0 E15 F1500\nG92 E0\nG1 Z1 F600",
     "machine_end_gcode": "END_PRINT",
     "machine_pause_gcode": "PAUSE",
+    "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600",
     "scan_first_layer": "0",
     "thumbnails_format":"PNG",
     "thumbnails": [
diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json
index 68417eebeb..0b86c46be8 100644
--- a/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json	
@@ -108,6 +108,11 @@
     "deretraction_speed": [
         "40"
     ],
+    "enable_filament_ramming": "0",
+    "cooling_tube_length": "0",
+    "cooling_tube_retraction": "0",
+    "parking_pos_retraction": "0",
+    "extra_loading_move": "0",
     "extruder_clearance_height_to_lid": "118",
     "extruder_clearance_height_to_rod": "24",
     "extruder_clearance_radius": "64",
@@ -125,6 +130,7 @@
     "machine_start_gcode":"M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F1500\nG1 X150 Y0 E15 F1500\nG92 E0\nG1 Z1 F600",
     "machine_end_gcode": "END_PRINT",
     "machine_pause_gcode": "PAUSE",
+    "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600",
     "scan_first_layer": "0",
     "thumbnails_format":"PNG",
     "thumbnails": [
diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json
index 2ad329e24e..ab0c9db164 100644
--- a/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json	
@@ -108,6 +108,11 @@
     "deretraction_speed": [
         "40"
     ],
+    "enable_filament_ramming": "0",
+    "cooling_tube_length": "0",
+    "cooling_tube_retraction": "0",
+    "parking_pos_retraction": "0",
+    "extra_loading_move": "0",
     "extruder_clearance_height_to_lid": "118",
     "extruder_clearance_height_to_rod": "24",
     "extruder_clearance_radius": "64",
@@ -125,6 +130,7 @@
     "machine_start_gcode":"M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F1500\nG1 X150 Y0 E15 F1500\nG92 E0\nG1 Z1 F600",
     "machine_end_gcode": "END_PRINT",
     "machine_pause_gcode": "PAUSE",
+    "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600",
     "scan_first_layer": "0",
     "thumbnails_format": "PNG",
     "thumbnails": [
diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json
index 2461c90711..72b061807a 100644
--- a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json	
@@ -108,6 +108,11 @@
     "deretraction_speed": [
         "40"
     ],
+    "enable_filament_ramming": "0",
+    "cooling_tube_length": "0",
+    "cooling_tube_retraction": "0",
+    "parking_pos_retraction": "0",
+    "extra_loading_move": "0",
     "extruder_clearance_height_to_lid": "118",
     "extruder_clearance_height_to_rod": "24",
     "extruder_clearance_radius": "64",
@@ -125,6 +130,7 @@
     "machine_start_gcode":"M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F1500\nG1 X150 Y0 E15 F1500\nG92 E0\nG1 Z1 F600",
     "machine_end_gcode": "END_PRINT",
     "machine_pause_gcode": "PAUSE",
+    "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600",
     "scan_first_layer": "0",
     "thumbnails_format":"PNG",
     "thumbnails": [