merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
SoftFever 2023-01-21 00:37:10 +08:00
parent 1bdedb1c47
commit 2492e5d39c
156 changed files with 33597 additions and 65667 deletions

View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.04.01.01",
"version": "01.04.01.04",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -201,6 +201,18 @@
"name": "Bambu PLA Basic @base",
"sub_path": "filament/Bambu PLA Basic @base.json"
},
{
"name": "Bambu PLA Tough @base",
"sub_path": "filament/Bambu PLA Tough @base.json"
},
{
"name": "Bambu PLA Marble @base",
"sub_path": "filament/Bambu PLA Marble @base.json"
},
{
"name": "Bambu PLA Sparkle @base",
"sub_path": "filament/Bambu PLA Sparkle @base.json"
},
{
"name": "Bambu PLA Impact @base",
"sub_path": "filament/Bambu PLA Impact @base.json"
@ -373,6 +385,34 @@
"name": "Bambu PLA Basic @BBL X1",
"sub_path": "filament/Bambu PLA Basic @BBL X1.json"
},
{
"name": "Bambu PLA Tough @BBL X1C",
"sub_path": "filament/Bambu PLA Tough @BBL X1C.json"
},
{
"name": "Bambu PLA Tough @BBL X1C 0.2 nozzle",
"sub_path": "filament/Bambu PLA Tough @BBL X1C 0.2 nozzle.json"
},
{
"name": "Bambu PLA Tough @BBL X1",
"sub_path": "filament/Bambu PLA Tough @BBL X1.json"
},
{
"name": "Bambu PLA Marble @BBL X1",
"sub_path": "filament/Bambu PLA Marble @BBL X1.json"
},
{
"name": "Bambu PLA Marble @BBL X1C",
"sub_path": "filament/Bambu PLA Marble @BBL X1C.json"
},
{
"name": "Bambu PLA Sparkle @BBL X1",
"sub_path": "filament/Bambu PLA Sparkle @BBL X1.json"
},
{
"name": "Bambu PLA Sparkle @BBL X1C",
"sub_path": "filament/Bambu PLA Sparkle @BBL X1C.json"
},
{
"name": "Bambu ABS @BBL X1C",
"sub_path": "filament/Bambu ABS @BBL X1C.json"
@ -469,11 +509,27 @@
"name":"Bambu PLA Basic @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Basic @BBL P1P.json"
},
{
"name":"Bambu PLA Tough @BBL P1P 0.2 nozzle",
"sub_path":"filament/P1P/Bambu PLA Tough @BBL P1P 0.2 nozzle.json"
},
{
"name":"Bambu PLA Tough @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Tough @BBL P1P.json"
},
{
"name":"Bambu PLA Marble @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Marble @BBL P1P.json"
},
{
"name":"Bambu PLA Sparkle @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Sparkle @BBL P1P.json"
},
{
"name": "Bambu ABS @BBL P1P",
"sub_path": "filament/P1P/Bambu ABS @BBL P1P.json"
},
{
{
"name": "Bambu PC @BBL P1P",
"sub_path": "filament/P1P/Bambu PC @BBL P1P.json"
},

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA07_01",
"name": "Bambu PLA Marble @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSA07_00",
"name": "Bambu PLA Marble @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -0,0 +1,23 @@
{
"type": "filament",
"filament_id": "GFA07",
"name": "Bambu PLA Marble @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"29.99"
],
"filament_density": [
"1.22"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"12"
]
}

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA08_01",
"name": "Bambu PLA Sparkle @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Sparkle @base",
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSA08_00",
"name": "Bambu PLA Sparkle @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Sparkle @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -0,0 +1,23 @@
{
"type": "filament",
"filament_id": "GFA08",
"name": "Bambu PLA Sparkle @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"29.99"
],
"filament_density": [
"1.26"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"12"
]
}

View file

@ -0,0 +1,19 @@
{
"type": "filament",
"setting_id": "GFSA09_01",
"name": "Bambu PLA Tough @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSA09_00",
"name": "Bambu PLA Tough @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA09_02",
"name": "Bambu PLA Tough @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"21"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -0,0 +1,20 @@
{
"type": "filament",
"filament_id": "GFA09",
"name": "Bambu PLA Tough @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"28.99"
],
"filament_flow_ratio": [
"0.98"
],
"filament_density": [
"1.26"
]
}

View file

@ -0,0 +1,34 @@
{
"type": "filament",
"setting_id": "GFSA07_10",
"name": "Bambu PLA Marble @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,34 @@
{
"type": "filament",
"setting_id": "GFSA08_10",
"name": "Bambu PLA Sparkle @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,32 @@
{
"type": "filament",
"setting_id": "GFSA09_10",
"name": "Bambu PLA Tough @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
]
}

View file

@ -0,0 +1,37 @@
{
"type": "filament",
"setting_id": "GFSA09_11",
"name": "Bambu PLA Tough @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -27,7 +27,6 @@
"deretraction_speed": [
"0"
],
"machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600 ; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90\nG0 X110 Y200 F3600",
"extruder_colour": [
"#018001"
],
@ -156,7 +155,8 @@
"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 F21000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\nM106 P2 S0\n{if old_filament_temp > 142 && next_extruder < 255}M104 S[old_filament_temp]{endif}\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 X120 F15000\n\nG1 X20 Y50 F21000\nG1 Y-3\nM620.1 X F21000\nT[next_extruder]\nM620.1 E F{new_filament_e_feedrate}\n; always use highest temperature to flush\nM400\nM109 S[nozzle_temperature_range_high]\n\n{if next_extruder < 255}\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; FLUSH_START\nM400\nM109 S[new_filament_temp]\nG1 E2 F{new_filament_e_feedrate} ;Compensate for filament spillage during waiting temperature\n; FLUSH_END\nM400\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\nM106 P1 S255\nM400 S3\nG1 X80 F15000\nG1 X60 F15000\nG1 X80 F15000\nG1 X60 F15000; shake to put down garbage\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": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little\nG1 X65 Y245 F12000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F10000\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}\nM623",
"layer_change_gcode": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little\nG1 X65 Y245 F12000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F10000\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}\nM623\n; update layer progress\nM73 L{layer_num+1}\nM991 S0 P{layer_num} ;notify layer change",
"machine_end_gcode": ";===== date: 20230110 =====================\n{if timelapse_type == 0}\nM991 S0 P-1 ;end traditional timelapse immediately\n{endif}\nM400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-0.8 F1800 ; retract\nG1 Z{max_layer_z + 0.5} F900 ; lower z a little\nG1 X65 Y245 F12000 ; move to safe pos \nG1 Y265 F3000\n{if timelapse_type == 1}\nM991 S0 P-1 ;end smooth timelapse at safe pos\nM400 S2 ;wait for last picture to be taken\n{endif}\n\nG1 X65 Y245 F12000\nG1 Y265 F3000\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off remote part cooling fan\nM106 P3 S0 ; turn off chamber cooling fan\n\nG1 X100 F12000 ; wipe\n; pull back filament to AMS\nM620 S255\nG1 X20 Y50 F12000\nG1 Y-3\nT255\nG1 X65 F12000\nG1 Y265\nG1 X100 F12000 ; wipe\nM621 S255\nM104 S0 ; turn off hotend\n\nM400 ; wait all motion done\nM17 S\nM17 Z0.4 ; lower z motor current to reduce impact if there is something in the bottom\n{if (max_layer_z + 100.0) < 250}\n G1 Z{max_layer_z + 100.0} F600\n G1 Z{max_layer_z +98.0}\n{else}\n G1 Z250 F600\n G1 Z248\n{endif}\nM400 P100\nM17 R ; restore z current\n\nG90\nG1 X128 Y250 F3600\n\nM220 S100 ; Reset feedrate magnitude\nM201.2 K1.0 ; Reset acc magnitude\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 0\n\nM17 X0.8 Y0.8 Z0.5 ; lower motor current to 45% power\n",
"machine_pause_gcode": "M400 U1\n",
"wipe": [
"1"