Merge branch 'main' into profile-fixes

This commit is contained in:
cochcoder
2024-04-10 18:46:58 +00:00
committed by GitHub
138 changed files with 6296 additions and 460 deletions

View File

@@ -47,12 +47,12 @@
"8000"
],
"machine_max_acceleration_z": [
"500",
"500"
"300",
"300"
],
"machine_max_speed_e": [
"100",
"100"
"40",
"40"
],
"machine_max_speed_x": [
"500",
@@ -71,12 +71,12 @@
"5"
],
"machine_max_jerk_x": [
"10",
"10"
"7",
"7"
],
"machine_max_jerk_y": [
"10",
"10"
"7",
"7"
],
"machine_max_jerk_z": [
"0.4",
@@ -91,8 +91,11 @@
"retraction_minimum_travel": [
"2"
],
"wipe_distance": [
"2"
],
"retract_before_wipe": [
"70%"
"0%"
],
"retraction_length": [
"0.5"
@@ -116,11 +119,11 @@
"default_filament_profile": [
"Creality Generic PLA @Ender-3V3-all"
],
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \n \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position \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 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-1.7 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
"machine_start_gcode": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp\nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position\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 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X-1.7 Y30 Z0.28 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder",
"machine_end_gcode": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z20 ;Raise Z more\nG90 ;Absolute positionning\nG1 X2 Y218 F3000 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"thumbnails": [
"96x96",
"300x300"
]
}
}

View File

@@ -28,44 +28,44 @@
"nozzle_type": "brass",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_retracting": [
"2500",
"2500"
],
"machine_max_acceleration_travel": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_x": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_y": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_z": [
"500",
"500"
],
"machine_max_speed_e": [
"100",
"100"
"40",
"40"
],
"machine_max_speed_x": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_y": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_z": [
"30",
"30"
"5",
"5"
],
"machine_max_jerk_e": [
"5",
@@ -117,8 +117,7 @@
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \nM420 S1; Enable mesh leveling \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \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 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z10 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X0 Y220 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"disable_m73": "1",
"thumbnails": [
"96x96",
"300x300"
]
}

View File

@@ -10,7 +10,7 @@
"printer_variant": "0.4",
"gcode_flavor": "marlin2",
"printer_structure": "i3",
"default_print_profile": "0.20mm Standard @Creality Ender3V3SE",
"default_print_profile": "0.20mm Standard @Creality Ender3V3SE 0.4",
"extruder_clearance_height_to_rod": "47",
"extruder_clearance_max_radius": "90",
"extruder_clearance_radius": "90",
@@ -28,44 +28,44 @@
"nozzle_type": "brass",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_retracting": [
"2500",
"2500"
],
"machine_max_acceleration_travel": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_x": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_y": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_z": [
"500",
"500"
],
"machine_max_speed_e": [
"100",
"100"
"40",
"40"
],
"machine_max_speed_x": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_y": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_z": [
"30",
"30"
"5",
"5"
],
"machine_max_jerk_e": [
"5",
@@ -117,8 +117,7 @@
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \nM420 S1; Enable mesh leveling \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \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 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z10 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X0 Y220 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"disable_m73": "1",
"thumbnails": [
"96x96",
"300x300"
]
}

View File

@@ -28,44 +28,44 @@
"nozzle_type": "brass",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_retracting": [
"2500",
"2500"
],
"machine_max_acceleration_travel": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_x": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_y": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_z": [
"500",
"500"
],
"machine_max_speed_e": [
"100",
"100"
"40",
"40"
],
"machine_max_speed_x": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_y": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_z": [
"30",
"30"
"5",
"5"
],
"machine_max_jerk_e": [
"5",
@@ -117,8 +117,7 @@
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \nM420 S1; Enable mesh leveling \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \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 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z10 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X0 Y220 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"disable_m73": "1",
"thumbnails": [
"96x96",
"300x300"
]
}

View File

@@ -28,44 +28,44 @@
"nozzle_type": "brass",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_retracting": [
"2500",
"2500"
],
"machine_max_acceleration_travel": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_x": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_y": [
"5000",
"5000"
"2500",
"2500"
],
"machine_max_acceleration_z": [
"500",
"500"
],
"machine_max_speed_e": [
"100",
"100"
"40",
"40"
],
"machine_max_speed_x": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_y": [
"500",
"500"
"250",
"250"
],
"machine_max_speed_z": [
"30",
"30"
"5",
"5"
],
"machine_max_jerk_e": [
"5",
@@ -117,8 +117,7 @@
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \nM420 S1; Enable mesh leveling \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \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 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z10 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X0 Y220 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"disable_m73": "1",
"thumbnails": [
"96x96",
"300x300"
]
}