3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 04:31:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'remote/master' into SoftFever

Browse source 
# Conflicts:
#	src/libslic3r/Preset.cpp
This commit is contained in:
SoftFever 2022-09-09 21:54:57 +08:00
commit bb74438f7c
132 changed files with 5737 additions and 3598 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resources/profiles/BBL.json
View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.02.00.00",
"version": "01.02.00.03",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -213,10 +213,6 @@
"name": "Generic PETG @base",
"sub_path": "filament/Generic PETG @base.json"
},
{
"name": "Generic PETG @0.2 nozzle",
"sub_path": "filament/Generic PETG @0.2 nozzle.json"
},
{
"name": "Generic PETG",
"sub_path": "filament/Generic PETG.json"
@ -261,6 +257,14 @@
"name": "Generic PC",
"sub_path": "filament/Generic PC.json"
},
{
"name": "Generic PVA @base",
"sub_path": "filament/Generic PVA @base.json"
},
{
"name": "Generic PVA @0.2 nozzle",
"sub_path": "filament/Generic PVA @0.2 nozzle.json"
},
{
"name": "Generic PVA",
"sub_path": "filament/Generic PVA.json"
@ -277,10 +281,6 @@
"name": "Bambu TPU 95A @BBL X1C",
"sub_path": "filament/Bambu TPU 95A @BBL X1C.json"
},
{
"name": "Bambu TPU 95A @BBL X1C 0.2 nozzle",
"sub_path": "filament/Bambu TPU 95A @BBL X1C 0.2 nozzle.json"
},
{
"name": "Bambu TPU 95A @BBL X1",
"sub_path": "filament/Bambu TPU 95A @BBL X1.json"
@ -399,6 +399,10 @@
"name": "Bambu Lab X1 0.4 nozzle",
"sub_path": "machine/Bambu Lab X1 0.4 nozzle.json"
},
{
"name": "Bambu Lab X1 0.2 nozzle",
"sub_path": "machine/Bambu Lab X1 0.2 nozzle.json"
},
{
"name": "Bambu Lab X1 0.8 nozzle",
"sub_path": "machine/Bambu Lab X1 0.8 nozzle.json"

5
resources/profiles/BBL/filament/Bambu ABS @BBL X1C 0.2 nozzle.json
View file

@ -6,9 +6,10 @@
"instantiation": "true",
"inherits": "Bambu ABS @base",
"filament_max_volumetric_speed": [
"4"
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

3
resources/profiles/BBL/filament/Bambu PC @BBL X1C 0.2 nozzle.json
View file

@ -12,6 +12,7 @@
"260"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

5
resources/profiles/BBL/filament/Bambu PLA Basic @BBL X1C 0.2 nozzle.json
View file

@ -6,9 +6,10 @@
"instantiation": "true",
"inherits": "Bambu PLA Basic @base",
"filament_max_volumetric_speed": [
"4"
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

5
resources/profiles/BBL/filament/Bambu PLA Matte @BBL X1C 0.2 nozzle.json
View file

@ -6,9 +6,10 @@
"instantiation": "true",
"inherits": "Bambu PLA Matte @base",
"filament_max_volumetric_speed": [
"4"
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

11
resources/profiles/BBL/filament/Bambu Support W @BBL X1C 0.2 nozzle.json
View file

@ -6,9 +6,16 @@
"instantiation": "true",
"inherits": "Bambu Support W @base",
"filament_max_volumetric_speed": [
"2"
"0.5"
],
"nozzle_temperature_initial_layer": [
"240"
],
"nozzle_temperature": [
"240"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

14
resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C 0.2 nozzle.json
View file

@ -1,14 +0,0 @@
{
"type": "filament",
"setting_id": "GFSU00_00",
"name": "Bambu TPU 95A @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu TPU 95A @base",
"filament_max_volumetric_speed": [
"0.5"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
]
}

14
resources/profiles/BBL/filament/Generic PETG @0.2 nozzle.json
View file

@ -1,14 +0,0 @@
{
"type": "filament",
"setting_id": "GFSG99_00",
"name": "Generic PETG @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PETG @base",
"filament_max_volumetric_speed": [
"1"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
]
}

15
resources/profiles/BBL/filament/Generic PVA @0.2 nozzle.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSS99_00",
"name": "Generic PVA @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PVA @base",
"filament_max_volumetric_speed": [
"0.5"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

20
resources/profiles/BBL/filament/Generic PVA @base.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "filament",
"filament_id": "GFS99",
"name": "Generic PVA @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pva",
"filament_flow_ratio": [
"0.95"
],
"filament_max_volumetric_speed": [
"16"
],
"slow_down_layer_time": [
"7"
],
"slow_down_min_speed": [
"20"
]
}

15
resources/profiles/BBL/filament/Generic PVA.json
View file

@ -1,23 +1,10 @@
{
"type": "filament",
"filament_id": "GFS99",
"setting_id": "GFSS99",
"name": "Generic PVA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pva",
"filament_flow_ratio": [
"0.95"
],
"filament_max_volumetric_speed": [
"16"
],
"slow_down_layer_time": [
"7"
],
"slow_down_min_speed": [
"20"
],
"inherits": "Generic PVA @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",

32
resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json Normal file
View file

File diff suppressed because one or more lines are too long

2
resources/profiles/BBL/machine/Bambu Lab X1.json
View file

@ -3,7 +3,7 @@
"name": "Bambu Lab X1",
"model_id": "BL-P002",
"url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json",
"nozzle_diameter": "0.4;0.6;0.8",
"nozzle_diameter": "0.4;0.2;0.6;0.8",
"machine_tech": "FFF",
"family": "BBL-3DP",
"bed_model": "bbl-3dp-X1.stl",

2
resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
View file

@ -152,7 +152,7 @@
"silent_mode": "0",
"single_extruder_multi_material": "1",
"change_filament_gcode": "M620 S[next_extruder]A\nM204 S9000\n{if toolchange_count > 1}\nG17\nG2 Z{max_layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\n{endif}\nG1 Z{max_layer_z + 3.0} F1200\n\nG1 X70 F12000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\n{if old_filament_temp > 0 && next_extruder < 255}M109 S[old_filament_temp]{endif}\nG1 X90 F3000\nG1 Y250 F4000\nG1 X100 F5000\nG1 X120 F12000\n\nG1 X20 Y50 F12000\nG1 Y-3\n\nT[next_extruder]\n\n; always use highest temperature to flush\nM400\nM109 S[nozzle_temperature_range_high]\n\n{if next_extruder < 255}\nG1 X54 F12000\nG1 Y265\n\nM400\n\nG92 E0\n{if flush_length_1 > 1}\n; FLUSH_START\n{if flush_length_1 > 23.7}\nG1 E23.7 F{old_filament_e_feedrate} ; do not need pulsatile flushing for start part\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{old_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\n{else}\nG1 E{flush_length_1} F{old_filament_e_feedrate}\n{endif}\n; FLUSH_END\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_2 > 1}\n; FLUSH_START\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_3 > 1}\n; FLUSH_START\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_4 > 1}\n; FLUSH_START\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n; FLUSH_END\n{endif}\n\nM400\nM109 S[new_filament_temp]\n\nM400\nM106 P1 S255\nM400 S3\nG1 X80 F15000\nG1 X60 F15000\nG1 X80 F15000\nG1 X60 F15000; shake to put down garbage\n\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\n\nG1 X70 F5000\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 Y265 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X165 F15000; wipe and shake\nG1 Y256 ; move Y to aside, prevent collision\nM400\nG1 Z[z_after_toolchange] F3000\n{if layer_z <= (initial_layer_print_height + 0.001)}\nM204 S[initial_layer_acceleration]\n{else}\nM204 S[default_acceleration]\n{endif}\n{else}\nG1 X[x_after_toolchange] Y[y_after_toolchange] Z[z_after_toolchange] F12000\n{endif}\nM621 S[next_extruder]A",
"layer_change_gcode": "{if timelapse_no_toolhead}\nG92 E0\nG1 E-[retraction_length] F1800\nG1 X65 Y245 F12000 ; move to safe pos\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}",
"layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG1 X65 Y245 F12000 ; move to safe pos\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{elsif timelapse_type == 2} ; timelapse without wipe tower\nM971 S11 C10 O0\n{endif}",
"machine_pause_gcode": "M400 U1\n",
"wipe": [
"1"

3
resources/profiles/BBL/process/0.10mm Standard @BBL X1C 0.2 nozzle.json
View file

@ -6,6 +6,7 @@
"instantiation": "true",
"inherits": "fdm_process_bbl_0.10_nozzle_0.2",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

2
resources/profiles/BBL/process/0.40mm Standard @BBL X1 0.8 nozzle.json
View file

@ -6,6 +6,6 @@
"instantiation": "true",
"inherits": "fdm_process_bbl_0.40_nozzle_0.8",
"compatible_printers": [
"Bambu Lab X1 0.6 nozzle"
"Bambu Lab X1 0.8 nozzle"
]
}