Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub master to 1.9.5.51 #4703

Merged
merged 9 commits into from
Aug 28, 2024
Merged

GitHub master to 1.9.5.51 #4703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e920bf6
ENH: add Bambu PPS-CF
XunZhangBambu Aug 1, 2024
fe1b80a
ENH: add Bambu PPA-CF
XunZhangBambu Aug 9, 2023
793a2e3
FIX: CLI: check enable_prime_tower also when checking wipe tower
lanewei120 Aug 27, 2024
74aecf6
ci: update build version to 01.09.04.61
Aug 27, 2024
69539d6
FIX: wrong vendor type in PPS and PPA
XunZhangBambu Aug 28, 2024
84465e1
FIX: SSDA cause arachne print fail
QingZhangBambu Aug 28, 2024
cfab728
ci: update build version to 01.09.04.62
Aug 28, 2024
d55e27e
NEW:update version to 1.9.5.50
walterwongbbl Aug 28, 2024
906a925
ci: update build version to 01.09.05.51
Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion resources/profiles/BBL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.09.00.19",
"version": "01.09.00.21",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
Expand Down Expand Up @@ -929,6 +929,14 @@
"name": "Generic PPS @base",
"sub_path": "filament/Generic PPS @base.json"
},
{
"name": "Bambu PPS-CF @base",
"sub_path": "filament/Bambu PPS-CF @base.json"
},
{
"name": "Bambu PPA-CF @base",
"sub_path": "filament/Bambu PPA-CF @base.json"
},
{
"name": "Generic PPA-CF @base",
"sub_path": "filament/Generic PPA-CF @base.json"
Expand Down Expand Up @@ -2333,6 +2341,18 @@
"name": "Generic PPS @BBL X1E",
"sub_path": "filament/Generic PPS @BBL X1E.json"
},
{
"name": "Bambu PPS-CF @BBL X1E",
"sub_path": "filament/Bambu PPS-CF @BBL X1E.json"
},
{
"name": "Bambu PPA-CF @BBL X1C",
"sub_path": "filament/Bambu PPA-CF @BBL X1C.json"
},
{
"name": "Bambu PPA-CF @BBL X1E",
"sub_path": "filament/Bambu PPA-CF @BBL X1E.json"
},
{
"name": "Generic PPA-CF @BBL X1E",
"sub_path": "filament/Generic PPA-CF @BBL X1E.json"
Expand Down
22 changes: 22 additions & 0 deletions resources/profiles/BBL/filament/Bambu PPA-CF @BBL X1C.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "filament",
"setting_id": "GFSN06_00",
"name": "Bambu PPA-CF @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PPA-CF @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.8 nozzle"
]
}
11 changes: 11 additions & 0 deletions resources/profiles/BBL/filament/Bambu PPA-CF @BBL X1E.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"type": "filament",
"setting_id": "GFSN06_01",
"name": "Bambu PPA-CF @BBL X1E",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PPA-CF @base",
"chamber_temperatures": [
"60"
]
}
44 changes: 44 additions & 0 deletions resources/profiles/BBL/filament/Bambu PPA-CF @base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"type": "filament",
"filament_id": "GFN06",
"name": "Bambu PPA-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pa",
"fan_cooling_layer_time": [
"5"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"filament_density": [
"1.17"
],
"filament_flow_ratio": [
"0.96"
],
"filament_type": [
"PA-CF"
],
"filament_vendor": [
"Bambu Lab"
],
"nozzle_temperature_range_high": [
"320"
],
"nozzle_temperature_range_low": [
"280"
],
"overhang_fan_speed": [
"40"
],
"overhang_fan_threshold": [
"0%"
],
"temperature_vitrification": [
"210"
]
}
13 changes: 13 additions & 0 deletions resources/profiles/BBL/filament/Bambu PPS-CF @BBL X1E.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "filament",
"name": "Bambu PPS-CF @BBL X1E",
"inherits": "Bambu PPS-CF @base",
"from": "system",
"setting_id": "GFST02_00",
"instantiation": "true",
"compatible_printers": [
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle"
]
}
41 changes: 41 additions & 0 deletions resources/profiles/BBL/filament/Bambu PPS-CF @base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"type": "filament",
"name": "Bambu PPS-CF @base",
"inherits": "fdm_filament_pps",
"from": "system",
"filament_id": "GFT02",
"instantiation": "false",
"fan_max_speed": [
"30"
],
"filament_cost": [
"175"
],
"filament_density": [
"1.26"
],
"filament_max_volumetric_speed": [
"6"
],
"filament_type": [
"PPS-CF"
],
"filament_vendor": [
"Bambu Lab"
],
"nozzle_temperature_range_high": [
"350"
],
"nozzle_temperature_range_low": [
"310"
],
"overhang_fan_threshold": [
"25%"
],
"required_nozzle_HRC": [
"40"
],
"temperature_vitrification": [
"220"
]
}
10 changes: 10 additions & 0 deletions src/BambuStudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3321,6 +3321,16 @@ int CLI::run(int argc, char **argv)
return;
}

bool wipe_tower_enabled = false;
if (print_config.has("enable_prime_tower")) {
wipe_tower_enabled = print_config.option<ConfigOptionBool>("enable_prime_tower")->value;
}
if (!wipe_tower_enabled) {
plate_obj_size_info.has_wipe_tower = false;
BOOST_LOG_TRIVIAL(info) << boost::format("enable_prime_tower set to false");
return;
}

int valid_count = plate->printable_instance_size();
if (valid_count <= 0){
plate_obj_size_info.has_wipe_tower = false;
Expand Down
4 changes: 3 additions & 1 deletion src/libslic3r/GCode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4569,8 +4569,10 @@ ExtrusionPaths GCode::merge_same_speed_paths(const ExtrusionPaths &paths)

// 100% overhang speed will not to set smooth speed
if (path.role() == erOverhangPerimeter) {
if (!merge_path.empty())
if (!merge_path.empty()) {
output_paths.push_back(std::move(merge_path));
merge_path.polyline.clear();
}
output_paths.push_back(std::move(path));
merge_start = path_idx + 1;
continue;
Expand Down
2 changes: 1 addition & 1 deletion version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ endif()

# The build_version should start from 50 in master branch

set(SLIC3R_VERSION "01.09.04.60")
set(SLIC3R_VERSION "01.09.05.51")
Loading