Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever

This commit is contained in:
SoftFever
2023-03-10 18:46:46 +08:00
19 changed files with 298 additions and 28 deletions
@@ -1,6 +1,6 @@
{
"type": "filament",
"setting_id": "GFST00",
"setting_id": "GFST01",
"name": "Bambu PET-CF @BBL X1C",
"from": "system",
"instantiation": "true",
@@ -11,9 +11,6 @@
"reduce_fan_stop_start_freq": [
"0"
],
"fan_cooling_layer_time": [
"4"
],
"slow_down_min_speed": [
"20"
],
@@ -22,6 +19,10 @@
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle"
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}
@@ -1,10 +1,58 @@
{
"type": "filament",
"filament_id": "GFT00",
"filament_id": "GFT01",
"name": "Bambu PET-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",
"temperature_vitrification": [
"185"
],
"overhang_fan_threshold": [
"0%"
],
"overhang_fan_speed": [
"40"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"filament_max_volumetric_speed": [
"8"
],
"slow_down_layer_time": [
"2"
],
"fan_cooling_layer_time": [
"5"
],
"cool_plate_temp" : [
"0"
],
"eng_plate_temp" : [
"80"
],
"hot_plate_temp" : [
"100"
],
"textured_plate_temp" : [
"100"
],
"cool_plate_temp_initial_layer" : [
"0"
],
"eng_plate_temp_initial_layer" : [
"80"
],
"hot_plate_temp_initial_layer" : [
"100"
],
"textured_plate_temp_initial_layer" : [
"100"
],
"required_nozzle_HRC": [
"40"
],
@@ -14,16 +62,22 @@
"filament_type": [
"PET-CF"
],
"filament_cost": [
"84.99"
],
"filament_density": [
"1.29"
],
"nozzle_temperature_range_low": [
"260"
],
"nozzle_temperature_range_high": [
"300"
"290"
],
"nozzle_temperature_initial_layer": [
"280"
"270"
],
"nozzle_temperature": [
"280"
"270"
]
}
@@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSG50_01",
"name": "Bambu PETG-CF @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PETG-CF @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}
@@ -0,0 +1,83 @@
{
"type": "filament",
"filament_id": "GFG50",
"name": "Bambu PETG-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",
"temperature_vitrification": [
"75"
],
"overhang_fan_threshold": [
"25%"
],
"overhang_fan_speed": [
"90"
],
"cool_plate_temp" : [
"0"
],
"eng_plate_temp" : [
"70"
],
"hot_plate_temp" : [
"70"
],
"textured_plate_temp" : [
"70"
],
"cool_plate_temp_initial_layer" : [
"0"
],
"eng_plate_temp_initial_layer" : [
"70"
],
"hot_plate_temp_initial_layer" : [
"70"
],
"textured_plate_temp_initial_layer" : [
"70"
],
"required_nozzle_HRC": [
"40"
],
"filament_vendor": [
"Bambu Lab"
],
"filament_type": [
"PETG-CF"
],
"nozzle_temperature_range_low": [
"240"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_initial_layer": [
"255"
],
"nozzle_temperature": [
"255"
],
"filament_cost": [
"34.99"
],
"filament_density": [
"1.25"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"0"
],
"filament_max_volumetric_speed": [
"14"
],
"slow_down_layer_time": [
"6"
],
"fan_cooling_layer_time": [
"20"
]
}
@@ -8,9 +8,6 @@
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"2"
],
"nozzle_temperature_initial_layer": [
"230"
],
@@ -20,6 +20,9 @@
"required_nozzle_HRC": [
"40"
],
"slow_down_layer_time": [
"8"
],
"nozzle_temperature_range_low": [
"210"
],
@@ -1,10 +1,43 @@
{
"type": "filament",
"filament_id": "GFG50",
"filament_id": "GFG98",
"name": "Generic PETG-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",
"temperature_vitrification": [
"75"
],
"overhang_fan_threshold": [
"25%"
],
"overhang_fan_speed": [
"90"
],
"cool_plate_temp" : [
"0"
],
"eng_plate_temp" : [
"70"
],
"hot_plate_temp" : [
"70"
],
"textured_plate_temp" : [
"70"
],
"cool_plate_temp_initial_layer" : [
"0"
],
"eng_plate_temp_initial_layer" : [
"70"
],
"hot_plate_temp_initial_layer" : [
"70"
],
"textured_plate_temp_initial_layer" : [
"70"
],
"required_nozzle_HRC": [
"40"
],
@@ -30,7 +63,7 @@
"34.99"
],
"filament_density": [
"1.04"
"1.25"
],
"fan_max_speed": [
"30"
@@ -39,7 +72,7 @@
"0"
],
"filament_max_volumetric_speed": [
"16"
"10"
],
"slow_down_layer_time": [
"6"
@@ -0,0 +1,20 @@
{
"type": "filament",
"filament_id": "GFA05",
"name": "Generic PLA Silk @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"12"
],
"slow_down_layer_time": [
"8"
],
"filament_start_gcode": [
"; 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};Prevent PLA from jamming"
]
}
@@ -4,7 +4,7 @@
"name": "Generic PLA Silk",
"from": "system",
"instantiation": "true",
"inherits": "Generic PLA @base",
"inherits": "Generic PLA Silk @base",
"filament_max_volumetric_speed": [
"7.5"
],
@@ -0,0 +1,25 @@
{
"type": "filament",
"setting_id": "GFST01_10",
"name": "Bambu PET-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PET-CF @base",
"slow_down_for_layer_cooling": [
"1"
],
"reduce_fan_stop_start_freq": [
"0"
],
"slow_down_min_speed": [
"20"
],
"slow_down_layer_time": [
"2"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}
@@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSG50_11",
"name": "Bambu PETG-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PETG-CF @base",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}
@@ -8,9 +8,6 @@
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"2"
],
"hot_plate_temp" : [
"65"
],
@@ -17,6 +17,9 @@
"textured_plate_temp_initial_layer" : [
"80"
],
"filament_max_volumetric_speed": [
"1"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
]
@@ -4,7 +4,7 @@
"name": "Generic PLA Silk @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Generic PLA @BBL P1P",
"inherits": "Generic PLA Silk @base",
"filament_max_volumetric_speed": [
"7.5"
],