Merge mainstream changes

This commit is contained in:
SoftFever 2022-10-04 12:24:49 +08:00
commit 764b7d62a0
204 changed files with 5425 additions and 1411 deletions

View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.02.00.03",
"version": "01.02.01.02",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -380,6 +380,14 @@
{
"name": "PolyTerra PLA @BBL X1",
"sub_path": "filament/PolyTerra PLA @BBL X1.json"
},
{
"name": "PolyTerra PLA @BBL X1C 0.2 nozzle",
"sub_path": "filament/PolyTerra PLA @BBL X1C 0.2 nozzle.json"
},
{
"name": "PolyLite PLA @BBL X1C 0.2 nozzle",
"sub_path": "filament/PolyLite PLA @BBL X1C 0.2 nozzle.json"
}
],
"machine_list": [

View file

@ -9,7 +9,7 @@
"Bambu Lab"
],
"filament_cost": [
"34.99"
"39.99"
],
"filament_flow_ratio": [
"0.94"

View file

@ -17,23 +17,11 @@
"cool_plate_temp": [
"40"
],
"hot_plate_temp": [
"40"
],
"textured_plate_temp": [
"40"
],
"cool_plate_temp_initial_layer": [
"40"
],
"hot_plate_temp_initial_layer": [
"40"
],
"textured_plate_temp_initial_layer": [
"40"
],
"filament_cost": [
"29.99"
"69.98"
],
"slow_down_layer_time": [
"8"

View file

@ -15,7 +15,7 @@
"230"
],
"filament_cost": [
"36.99"
"41.99"
],
"nozzle_temperature": [
"230"

View file

@ -41,6 +41,18 @@
"nozzle_temperature_range_high": [
"270"
],
"hot_plate_temp" : [
"70"
],
"textured_plate_temp" : [
"70"
],
"textured_plate_temp_initial_layer" : [
"70"
],
"hot_plate_temp_initial_layer" : [
"70"
],
"filament_start_gcode": [
" ; filament start gcode\n{if (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{endif}"
]

View file

@ -12,6 +12,8 @@
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle"
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

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

View file

@ -12,6 +12,8 @@
"; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle"
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -12,6 +12,8 @@
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle"
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

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

View file

@ -12,6 +12,8 @@
"; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle"
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -68,7 +68,7 @@
"255"
],
"temperature_vitrification": [
"80"
"70"
],
"nozzle_temperature_range_low": [
"220"

View file

@ -26,10 +26,10 @@
"0"
],
"hot_plate_temp" : [
"45"
"55"
],
"textured_plate_temp" : [
"45"
"55"
],
"cool_plate_temp_initial_layer" : [
"35"
@ -38,10 +38,10 @@
"0"
],
"hot_plate_temp_initial_layer" : [
"45"
"55"
],
"textured_plate_temp_initial_layer" : [
"45"
"55"
],
"nozzle_temperature_initial_layer": [
"220"

View file

@ -11,10 +11,10 @@
"0"
],
"hot_plate_temp" : [
"45"
"55"
],
"textured_plate_temp" : [
"45"
"55"
],
"cool_plate_temp_initial_layer" : [
"35"
@ -23,10 +23,10 @@
"0"
],
"hot_plate_temp_initial_layer" : [
"45"
"55"
],
"textured_plate_temp_initial_layer" : [
"45"
"55"
],
"fan_cooling_layer_time": [
"100"

View file

@ -74,7 +74,7 @@
"240"
],
"temperature_vitrification": [
"30"
"35"
],
"nozzle_temperature_range_low": [
"200"

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

@ -64,8 +64,8 @@
"200"
],
"machine_max_speed_e": [
"25",
"25"
"30",
"30"
],
"machine_max_speed_x": [
"500",