mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-12-24 00:28:38 -07:00
Merge branch 'main' into filaments-without-submenu
This commit is contained in:
commit
e2f5d589fa
52 changed files with 195 additions and 43 deletions
|
|
@ -94,6 +94,9 @@
|
|||
],
|
||||
"z_hop": [
|
||||
"0.2"
|
||||
],
|
||||
"machine_max_junction_deviation": [
|
||||
"0.01"
|
||||
],
|
||||
"fan_speedup_time": "0.2",
|
||||
"fan_speedup_overhangs": "1",
|
||||
|
|
@ -102,7 +105,7 @@
|
|||
"printable_height": "180",
|
||||
"machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X170 Y170 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+50, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM572 S0 ; reset PA\nM569 S1 X Y ; reset to stealthchop for X Y\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
|
||||
"machine_pause_gcode": "M601",
|
||||
"machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.0.3+14902\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nG28 ; home all without mesh bed level\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow",
|
||||
"machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.4.0+11974\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nG28 ; home all without mesh bed level\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow",
|
||||
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))} Y{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))}",
|
||||
"change_filament_gcode": "M600",
|
||||
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n",
|
||||
|
|
|
|||
|
|
@ -95,6 +95,9 @@
|
|||
"z_hop": [
|
||||
"0.2"
|
||||
],
|
||||
"machine_max_junction_deviation": [
|
||||
"0.01"
|
||||
],
|
||||
"fan_speedup_time": "0.2",
|
||||
"fan_speedup_overhangs": "1",
|
||||
"fan_kickstart": "0",
|
||||
|
|
@ -102,7 +105,7 @@
|
|||
"printable_height": "210",
|
||||
"machine_end_gcode": "{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X241 Y201 F3600 ; park\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+23, max_print_height)} F300 ; Move print head up{endif}\nG4 ; wait\nM572 S0 ; reset PA\nM593 X T2 F0 ; disable IS\nM593 Y T2 F0 ; disable IS\nM84 X Y E ; disable motors\n; max_layer_z = [max_layer_z]",
|
||||
"machine_pause_gcode": "M601",
|
||||
"machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.3 P \"MK3.5\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.2.2+8853\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nG28 ; home all\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S170 ; set extruder temp for bed leveling\nM109 T0 R170 ; wait for temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X23 Y5 W80 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\n; Extrude purge line\n\nG92 E0 ; reset extruder position\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X{45 + 3} Z0.05 F8000 ; wipe, move close to the bed\nG0 X{45 + 3 * 2} Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; reset flow to 100%\n",
|
||||
"machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.3 P \"MK3.5\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.4.0+11974\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nG28 ; home all\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S170 ; set extruder temp for bed leveling\nM109 T0 R170 ; wait for temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X23 Y5 W80 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\n; Extrude purge line\n\nG92 E0 ; reset extruder position\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X{45 + 3} Z0.05 F8000 ; wipe, move close to the bed\nG0 X{45 + 3 * 2} Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; reset flow to 100%\n",
|
||||
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1400,2500), (10000,2500))} Y{interpolate_table(extruded_weight_total, (0,4000), (1400,2500), (10000,2500))}\n",
|
||||
"change_filament_gcode": "M600",
|
||||
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n",
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@
|
|||
"top_shell_layers": "13",
|
||||
"bottom_shell_thickness": "0.5",
|
||||
"bottom_shell_layers": "10",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@
|
|||
"top_shell_layers": "13",
|
||||
"bottom_shell_thickness": "0.5",
|
||||
"bottom_shell_layers": "10",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@
|
|||
"bottom_shell_layers": "8",
|
||||
"bridge_speed": "30",
|
||||
"internal_solid_infill_speed": "140",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@
|
|||
"bottom_shell_layers": "8",
|
||||
"bridge_speed": "30",
|
||||
"internal_solid_infill_speed": "140",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@
|
|||
"internal_solid_infill_acceleration": "3000",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@
|
|||
"internal_solid_infill_acceleration": "3000",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@
|
|||
"overhang_1_4_speed": "60",
|
||||
"internal_solid_infill_acceleration": "2500",
|
||||
"sparse_infill_acceleration": "2500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@
|
|||
"overhang_1_4_speed": "60",
|
||||
"internal_solid_infill_acceleration": "2500",
|
||||
"sparse_infill_acceleration": "2500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"sparse_infill_acceleration": "2500",
|
||||
"travel_acceleration": "3000",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"sparse_infill_acceleration": "2500",
|
||||
"travel_acceleration": "3000",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
"inner_wall_acceleration": "3500",
|
||||
"outer_wall_acceleration": "2500",
|
||||
"bridge_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
"inner_wall_acceleration": "3500",
|
||||
"outer_wall_acceleration": "2500",
|
||||
"bridge_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_interface_spacing": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@
|
|||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"bridge_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_interface_spacing": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,9 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,10 @@
|
|||
"inner_wall_acceleration": "2500",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"bridge_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@
|
|||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"bridge_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,9 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "1",
|
||||
"support_top_z_distance": "0.09",
|
||||
"support_bottom_z_distance": "0.09",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.25 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,11 @@
|
|||
"inner_wall_acceleration": "2500",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"bridge_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -28,7 +28,8 @@
|
|||
"internal_solid_infill_acceleration": "2500",
|
||||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"support_top_z_distance": "0.1",
|
||||
"support_top_z_distance": "0.17",
|
||||
"support_bottom_z_distance": "0.17",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.4 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -36,5 +36,10 @@
|
|||
"outer_wall_acceleration": "4000",
|
||||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45"
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25"
|
||||
}
|
||||
|
|
@ -36,5 +36,10 @@
|
|||
"outer_wall_acceleration": "4000",
|
||||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45"
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25"
|
||||
}
|
||||
|
|
@ -34,5 +34,10 @@
|
|||
"outer_wall_acceleration": "2000",
|
||||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45"
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25"
|
||||
}
|
||||
|
|
@ -34,5 +34,10 @@
|
|||
"outer_wall_acceleration": "2000",
|
||||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45"
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25"
|
||||
}
|
||||
|
|
@ -29,6 +29,11 @@
|
|||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,6 +29,11 @@
|
|||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,11 @@
|
|||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,11 @@
|
|||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"overhang_1_4_speed": "45",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@
|
|||
"overhang_1_4_speed": "45",
|
||||
"travel_speed": "300",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@
|
|||
"overhang_1_4_speed": "45",
|
||||
"travel_speed": "300",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,11 @@
|
|||
"gap_infill_speed": "60",
|
||||
"support_speed": "80",
|
||||
"travel_speed": "300",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,11 @@
|
|||
"gap_infill_speed": "60",
|
||||
"support_speed": "80",
|
||||
"travel_speed": "300",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,11 @@
|
|||
"bottom_shell_thickness": "0.5",
|
||||
"bottom_shell_layers": "2",
|
||||
"travel_speed": "300",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.35",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.8 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,11 @@
|
|||
"bottom_shell_thickness": "0.5",
|
||||
"bottom_shell_layers": "2",
|
||||
"travel_speed": "300",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.35",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.8 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -37,7 +37,11 @@
|
|||
"outer_wall_acceleration": "4000",
|
||||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -39,7 +39,11 @@
|
|||
"outer_wall_acceleration": "4000",
|
||||
"bridge_acceleration": "1500",
|
||||
"internal_solid_infill_acceleration": "3000",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@
|
|||
"top_surface_speed": "55",
|
||||
"gap_infill_speed": "45",
|
||||
"travel_speed": "300",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@
|
|||
"top_surface_speed": "55",
|
||||
"gap_infill_speed": "45",
|
||||
"travel_speed": "300",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@
|
|||
"top_surface_speed": "55",
|
||||
"gap_infill_speed": "45",
|
||||
"travel_speed": "300",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@
|
|||
"top_surface_speed": "55",
|
||||
"gap_infill_speed": "45",
|
||||
"travel_speed": "300",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.22",
|
||||
"support_bottom_z_distance": "0.22",
|
||||
"support_bottom_interface_spacing": "0.22",
|
||||
"support_interface_spacing": "0.25",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.6 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -41,7 +41,11 @@
|
|||
"inner_wall_acceleration": "3000",
|
||||
"outer_wall_acceleration": "2500",
|
||||
"bridge_acceleration": "1000",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.35",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.8 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -41,7 +41,11 @@
|
|||
"inner_wall_acceleration": "3000",
|
||||
"outer_wall_acceleration": "2500",
|
||||
"bridge_acceleration": "1000",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.35",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.8 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -40,7 +40,11 @@
|
|||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"bridge_acceleration": "1000",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.35",
|
||||
"compatible_printers": [
|
||||
"Prusa MINIIS 0.8 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -41,7 +41,11 @@
|
|||
"inner_wall_acceleration": "2000",
|
||||
"outer_wall_acceleration": "1500",
|
||||
"bridge_acceleration": "1000",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_top_z_distance": "0.25",
|
||||
"support_bottom_z_distance": "0.25",
|
||||
"support_bottom_interface_spacing": "0.25",
|
||||
"support_interface_spacing": "0.35",
|
||||
"compatible_printers": [
|
||||
"Prusa MK3.5 0.8 nozzle"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -55,10 +55,13 @@
|
|||
"raft_contact_distance": "0.15",
|
||||
"raft_expansion": "1.5",
|
||||
"raft_first_layer_density": "90%",
|
||||
"raft_first_layer_expansion": "3.5",
|
||||
"support_threshold_angle": "40",
|
||||
"support_interface_bottom_layers": "0",
|
||||
"support_base_pattern": "rectilinear",
|
||||
"support_interface_top_layers": "3",
|
||||
"support_top_z_distance": "0.17"
|
||||
"raft_first_layer_expansion": "3",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_bottom_interface_spacing": "0.2",
|
||||
"support_interface_spacing": "0.2",
|
||||
"support_top_z_distance": "0.2"
|
||||
}
|
||||
|
|
@ -55,10 +55,13 @@
|
|||
"raft_contact_distance": "0.15",
|
||||
"raft_expansion": "1.5",
|
||||
"raft_first_layer_density": "90%",
|
||||
"raft_first_layer_expansion": "3.5",
|
||||
"support_threshold_angle": "40",
|
||||
"support_interface_bottom_layers": "0",
|
||||
"support_base_pattern": "rectilinear",
|
||||
"support_interface_top_layers": "3",
|
||||
"support_top_z_distance": "0.17"
|
||||
"raft_first_layer_expansion": "3",
|
||||
"support_base_pattern_spacing": "2",
|
||||
"support_bottom_interface_spacing": "0.2",
|
||||
"support_interface_spacing": "0.2",
|
||||
"support_top_z_distance": "0.2"
|
||||
}
|
||||
|
|
@ -2727,8 +2727,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
|
|||
|
||||
auto probe_dist_x = std::max(1., m_config.bed_mesh_probe_distance.value.x());
|
||||
auto probe_dist_y = std::max(1., m_config.bed_mesh_probe_distance.value.y());
|
||||
int probe_count_x = std::max(3, (int) std::ceil(mesh_bbox.size().x() / probe_dist_x));
|
||||
int probe_count_y = std::max(3, (int) std::ceil(mesh_bbox.size().y() / probe_dist_y));
|
||||
int probe_count_x = std::max(3, (int) std::ceil(mesh_bbox.size().x() / probe_dist_x) + 1);
|
||||
int probe_count_y = std::max(3, (int) std::ceil(mesh_bbox.size().y() / probe_dist_y) + 1);
|
||||
auto bed_mesh_algo = "bicubic";
|
||||
if (probe_count_x * probe_count_y <= 6) { // lagrange needs up to a total of 6 mesh points
|
||||
bed_mesh_algo = "lagrange";
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ OG_CustomCtrl::OG_CustomCtrl( wxWindow* parent,
|
|||
// BBS: new font
|
||||
m_font = Label::Body_14;
|
||||
SetFont(m_font);
|
||||
m_em_unit = em_unit(m_parent);
|
||||
m_em_unit = em_unit(m_parent);
|
||||
m_v_gap = lround(1.2 * m_em_unit);
|
||||
m_v_gap2 = lround(0.8 * m_em_unit);
|
||||
m_h_gap = lround(0.2 * m_em_unit);
|
||||
|
|
@ -597,7 +597,7 @@ void OG_CustomCtrl::msw_rescale()
|
|||
SetFont(m_font);
|
||||
m_em_unit = em_unit(m_parent);
|
||||
m_v_gap = lround(1.2 * m_em_unit);
|
||||
m_v_gap2 = lround(0.8 * m_em_unit);
|
||||
m_v_gap2 = lround(0.8 * m_em_unit);
|
||||
m_h_gap = lround(0.2 * m_em_unit);
|
||||
|
||||
//m_bmp_mode_sz = create_scaled_bitmap("mode_simple", this, wxOSX ? 10 : 12).GetSize();
|
||||
|
|
@ -992,7 +992,7 @@ wxPoint OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBi
|
|||
pos.y += lround((height - get_bitmap_size(bmp_undo).GetHeight()) / 2);
|
||||
}
|
||||
#endif
|
||||
wxCoord h_pos = pos.x;
|
||||
wxCoord h_pos = pos.x - ctrl->m_h_gap; // Orca: adjust position to the left
|
||||
wxCoord v_pos = pos.y;
|
||||
|
||||
#ifndef DISABLE_UNDO_SYS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue