Add Creality Ender-3 S1 Plus

resources/profiles/Creality.json

@@ -44,6 +44,10 @@
 			"name": "Creality Ender-3 S1 Pro",
 			"sub_path": "machine/Creality Ender-3 S1 Pro.json"
 		},
+		{
+			"name": "Creality Ender-3 S1 Plus",
+			"sub_path": "machine/Creality Ender-3 S1 Plus.json"
+		},
 		{
 			"name": "Creality Ender-3 V3 SE",
 			"sub_path": "machine/Creality Ender-3 V3 SE.json"
@@ -370,6 +374,22 @@
 			"name": "0.16mm Optimal @Creality Ender3S1Pro",
 			"sub_path": "process/0.16mm Optimal @Creality Ender3S1Pro.json"
 		},
+		{
+			"name": "0.16mm Optimal @Creality Ender3S1Plus 0.2",
+			"sub_path": "process/0.16mm Optimal @Creality Ender3S1Plus 0.2.json"
+		},
+		{
+			"name": "0.16mm Optimal @Creality Ender3S1Plus 0.4",
+			"sub_path": "process/0.16mm Optimal @Creality Ender3S1Plus 0.4.json"
+		},
+		{
+			"name": "0.16mm Optimal @Creality Ender3S1Plus 0.6",
+			"sub_path": "process/0.16mm Optimal @Creality Ender3S1Plus 0.6.json"
+		},
+		{
+			"name": "0.16mm Optimal @Creality Ender3S1Plus 0.8",
+			"sub_path": "process/0.16mm Optimal @Creality Ender3S1Plus 0.8.json"
+		},
 		{
 			"name": "0.16mm Optimal @Creality Ender3V3KE",
 			"sub_path": "process/0.16mm Optimal @Creality Ender3V3KE.json"
@@ -498,6 +518,22 @@
 			"name": "0.20mm Standard @Creality Ender3S1Pro",
 			"sub_path": "process/0.20mm Standard @Creality Ender3S1Pro.json"
 		},
+		{
+			"name": "0.20mm Standard @Creality Ender3S1Plus 0.2",
+			"sub_path": "process/0.20mm Standard @Creality Ender3S1Plus 0.2.json"
+		},
+		{
+			"name": "0.20mm Standard @Creality Ender3S1Plus 0.4",
+			"sub_path": "process/0.20mm Standard @Creality Ender3S1Plus 0.4.json"
+		},
+		{
+			"name": "0.20mm Standard @Creality Ender3S1Plus 0.6",
+			"sub_path": "process/0.20mm Standard @Creality Ender3S1Plus 0.6.json"
+		},
+		{
+			"name": "0.20mm Standard @Creality Ender3S1Plus 0.8",
+			"sub_path": "process/0.20mm Standard @Creality Ender3S1Plus 0.8.json"
+		},
 		{
 			"name": "0.20mm Standard @Creality Ender3V3KE",
 			"sub_path": "process/0.20mm Standard @Creality Ender3V3KE.json"
@@ -634,6 +670,22 @@
 			"name": "0.24mm Draft @Creality Ender3V3SE 0.8",
 			"sub_path": "process/0.24mm Draft @Creality Ender3V3SE 0.8.json"
 		},
+		{
+			"name": "0.24mm Draft @Creality Ender3S1Plus 0.2",
+			"sub_path": "process/0.24mm Draft @Creality Ender3S1Plus 0.2.json"
+		},
+		{
+			"name": "0.24mm Draft @Creality Ender3S1Plus 0.4",
+			"sub_path": "process/0.24mm Draft @Creality Ender3S1Plus 0.4.json"
+		},
+		{
+			"name": "0.24mm Draft @Creality Ender3S1Plus 0.6",
+			"sub_path": "process/0.24mm Draft @Creality Ender3S1Plus 0.6.json"
+		},
+		{
+			"name": "0.24mm Draft @Creality Ender3S1Plus 0.8",
+			"sub_path": "process/0.24mm Draft @Creality Ender3S1Plus 0.8.json"
+		},
 		{
 			"name": "0.24mm Draft @Creality Ender5Pro (2019) 0.3",
 			"sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) 0.3.json"
@@ -1078,6 +1130,22 @@
 			"name": "Creality Ender-3 S1 Pro 0.4 nozzle",
 			"sub_path": "machine/Creality Ender-3 S1 Pro 0.4 nozzle.json"
 		},
+		{
+			"name": "Creality Ender-3 S1 Plus 0.2 nozzle",
+			"sub_path": "machine/Creality Ender-3 S1 Plus 0.2 nozzle.json"
+		},
+		{
+			"name": "Creality Ender-3 S1 Plus 0.4 nozzle",
+			"sub_path": "machine/Creality Ender-3 S1 Plus 0.4 nozzle.json"
+		},
+		{
+			"name": "Creality Ender-3 S1 Plus 0.6 nozzle",
+			"sub_path": "machine/Creality Ender-3 S1 Plus 0.6 nozzle.json"
+		},
+		{
+			"name": "Creality Ender-3 S1 Plus 0.8 nozzle",
+			"sub_path": "machine/Creality Ender-3 S1 Plus 0.8 nozzle.json"
+		},
 		{
 			"name": "Creality Ender-3 V3 SE 0.2 nozzle",
 			"sub_path": "machine/Creality Ender-3 V3 SE 0.2 nozzle.json"
@@ -1183,4 +1251,4 @@
 			"sub_path": "machine/Creality K1 Max (0.8 nozzle).json"
 		}
 	]
-}
+}

resources/profiles/Creality/filament/Creality Generic ABS.json

@@ -31,6 +31,10 @@
 		"Creality Ender-3 V2 Neo 0.4 nozzle",
 		"Creality Ender-3 S1 0.4 nozzle",
 		"Creality Ender-3 S1 Pro 0.4 nozzle",
+		"Creality Ender-3 S1 Plus 0.2 nozzle",
+		"Creality Ender-3 S1 Plus 0.4 nozzle",
+		"Creality Ender-3 S1 Plus 0.6 nozzle",
+		"Creality Ender-3 S1 Plus 0.8 nozzle",
 		"Creality Ender-5 0.4 nozzle",
 		"Creality Ender-5 Plus 0.4 nozzle",
 		"Creality Ender-5 Pro (2019) 0.2 nozzle",

resources/profiles/Creality/filament/Creality Generic PETG.json

@@ -41,6 +41,10 @@
 		"Creality Ender-3 V2 Neo 0.4 nozzle",
 		"Creality Ender-3 S1 0.4 nozzle",
 		"Creality Ender-3 S1 Pro 0.4 nozzle",
+		"Creality Ender-3 S1 Plus 0.2 nozzle",
+		"Creality Ender-3 S1 Plus 0.4 nozzle",
+		"Creality Ender-3 S1 Plus 0.6 nozzle",
+		"Creality Ender-3 S1 Plus 0.8 nozzle",
 		"Creality Ender-5 0.4 nozzle",
 		"Creality Ender-5 Plus 0.4 nozzle",
 		"Creality Ender-5 Pro (2019) 0.2 nozzle",

resources/profiles/Creality/filament/Creality Generic PLA.json

@@ -32,6 +32,10 @@
 		"Creality Ender-3 V2 Neo 0.4 nozzle",
 		"Creality Ender-3 S1 0.4 nozzle",
 		"Creality Ender-3 S1 Pro 0.4 nozzle",
+		"Creality Ender-3 S1 Plus 0.2 nozzle",
+		"Creality Ender-3 S1 Plus 0.4 nozzle",
+		"Creality Ender-3 S1 Plus 0.6 nozzle",
+		"Creality Ender-3 S1 Plus 0.8 nozzle",
 		"Creality Ender-5 0.4 nozzle",
 		"Creality Ender-5 Plus 0.4 nozzle",
 		"Creality Ender-5 Pro (2019) 0.2 nozzle",

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json

@@ -0,0 +1,117 @@
+{
+	"type": "machine",
+	"setting_id": "GM001",
+	"name": "Creality Ender-3 S1 Plus 0.2 nozzle",
+	"from": "system",
+	"instantiation": "true",
+	"inherits": "fdm_creality_common",
+	"printer_model": "Creality Ender-3 S1 Plus",
+	"printer_variant": "0.2",
+	"printer_structure": "i3",
+	"default_print_profile": "0.20mm Standard @Creality Ender3S1Plus 0.2",
+	"nozzle_diameter": [
+		"0.2"
+	],
+	"printable_area": [
+		"0x0",
+		"300x0",
+		"300x300",
+		"0x300"
+	],
+	"printable_height": "300",
+	"nozzle_type": "undefine",
+	"auxiliary_fan": "0",
+	"machine_max_acceleration_extruding": [
+		"500",
+		"500"
+	],
+	"machine_max_acceleration_retracting": [
+		"1000",
+		"1000"
+	],
+	"machine_max_acceleration_travel": [
+		"5000",
+		"5000"
+	],
+	"machine_max_acceleration_x": [
+		"500",
+		"500"
+	],
+	"machine_max_acceleration_y": [
+		"500",
+		"500"
+	],
+	"machine_max_acceleration_z": [
+		"100",
+		"100"
+	],
+	"machine_max_speed_e": [
+		"60",
+		"60"
+	],
+	"machine_max_speed_x": [
+		"500",
+		"500"
+	],
+	"machine_max_speed_y": [
+		"500",
+		"500"
+	],
+	"machine_max_speed_z": [
+		"10",
+		"10"
+	],
+	"machine_max_jerk_e": [
+		"5",
+		"5"
+	],
+	"machine_max_jerk_x": [
+		"8",
+		"8"
+	],
+	"machine_max_jerk_y": [
+		"8",
+		"8"
+	],
+	"machine_max_jerk_z": [
+		"0.4",
+		"0.4"
+	],
+	"max_layer_height": [
+		"0.36"
+	],
+	"min_layer_height": [
+		"0.08"
+	],
+	"printer_settings_id": "Creality",
+	"retraction_minimum_travel": [
+		"1"
+	],
+	"retract_before_wipe": [
+		"0%"
+	],
+	"retraction_length": [
+		"0.4"
+	],
+	"retract_length_toolchange": [
+		"1"
+	],
+	"retraction_speed": [
+		"45"
+	],
+	"deretraction_speed": [
+		"45"
+	],
+	"z_hop": [
+		"0"
+	],
+	"single_extruder_multi_material": "1",
+	"change_filament_gcode": "M600",
+	"machine_pause_gcode": "M25",
+	"default_filament_profile": [
+		"Creality Generic PLA"
+	],
+	"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\nG28 ; home all axis and restore leveling \nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"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",
+	"scan_first_layer": "0"
+}

resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.4 nozzle.json

@@ -0,0 +1,117 @@
+{
+	"type": "machine",
+	"setting_id": "GM001",
+	"name": "Creality Ender-3 S1 Plus 0.4 nozzle",
+	"from": "system",
+	"instantiation": "true",
+	"inherits": "fdm_creality_common",
+	"printer_model": "Creality Ender-3 S1 Plus",
+	"printer_variant": "0.4",
+	"printer_structure": "i3",
+	"default_print_profile": "0.20mm Standard @Creality Ender3S1Plus 0.4",
+	"nozzle_diameter": [
+		"0.4"
+	],
+	"printable_area": [
+		"0x0",
+		"300x0",
+		"300x300",
+		"0x300"
+	],
+	"printable_height": "300",
+	"nozzle_type": "undefine",
+	"auxiliary_fan": "0",
+	"machine_max_acceleration_extruding": [
+		"500",
+		"500"
+	],
+	"machine_max_acceleration_retracting": [
+		"1000",
+		"1000"
+	],
+	"machine_max_acceleration_travel": [
+		"5000",
+		"5000"
+	],
+	"machine_max_acceleration_x": [
+		"500",
+		"500"
+	],
+	"machine_max_acceleration_y": [
+		"500",
+		"500"
+	],
+	"machine_max_acceleration_z": [
+		"100",
+		"100"
+	],
+	"machine_max_speed_e": [
+		"60",
+		"60"
+	],
+	"machine_max_speed_x": [
+		"500",
+		"500"
+	],
+	"machine_max_speed_y": [
+		"500",
+		"500"
+	],
+	"machine_max_speed_z": [
+		"10",
+		"10"
+	],
+	"machine_max_jerk_e": [
+		"5",
+		"5"
+	],
+	"machine_max_jerk_x": [
+		"8",
+		"8"
+	],
+	"machine_max_jerk_y": [
+		"8",
+		"8"
+	],
+	"machine_max_jerk_z": [
+		"0.4",
+		"0.4"
+	],
+	"max_layer_height": [
+		"0.36"
+	],
+	"min_layer_height": [
+		"0.08"
+	],
+	"printer_settings_id": "Creality",
+	"retraction_minimum_travel": [
+		"1"
+	],
+	"retract_before_wipe": [
+		"0%"
+	],
+	"retraction_length": [
+		"0.4"
+	],
+	"retract_length_toolchange": [
+		"1"
+	],
+	"retraction_speed": [
+		"45"
+	],
+	"deretraction_speed": [
+		"45"
+	],
+	"z_hop": [
+		"0"
+	],
+	"single_extruder_multi_material": "1",
+	"change_filament_gcode": "M600",
+	"machine_pause_gcode": "M25",
+	"default_filament_profile": [
+		"Creality Generic PLA"
+	],
+	"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\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
+	"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",
+	"scan_first_layer": "0"
+}