3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
SoftFever 2023-03-10 18:42:19 +08:00
commit da61839e84
19 changed files with 298 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BuildLinux.sh
View file

@ -222,9 +222,9 @@ then
fi fi
if [[ -n "$BUILD_DEBUG" ]] if [[ -n "$BUILD_DEBUG" ]]
then then
BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug" BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
else else
BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1" BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0"
fi fi
# cmake # cmake

26
resources/profiles/BBL.json
View file

@ -1,7 +1,7 @@
{ {
"name": "Bambulab", "name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.05.00.17", "version": "01.05.00.19",
"force_update": "0", "force_update": "0",
"description": "the initial version of BBL configurations", "description": "the initial version of BBL configurations",
"machine_model_list": [ "machine_model_list": [
@ -361,6 +361,10 @@
"name": "Generic PLA", "name": "Generic PLA",
"sub_path": "filament/Generic PLA.json" "sub_path": "filament/Generic PLA.json"
}, },
{
"name": "Generic PLA Silk @base",
"sub_path": "filament/Generic PLA Silk @base.json"
},
{ {
"name": "Generic PLA Silk", "name": "Generic PLA Silk",
"sub_path": "filament/Generic PLA Silk.json" "sub_path": "filament/Generic PLA Silk.json"
@ -441,6 +445,18 @@
"name": "Generic PETG-CF @BBL P1P", "name": "Generic PETG-CF @BBL P1P",
"sub_path": "filament/P1P/Generic PETG-CF @BBL P1P.json" "sub_path": "filament/P1P/Generic PETG-CF @BBL P1P.json"
}, },
{
"name": "Bambu PETG-CF @base",
"sub_path": "filament/Bambu PETG-CF @base.json"
},
{
"name": "Bambu PETG-CF @BBL X1C",
"sub_path": "filament/Bambu PETG-CF @BBL X1C.json"
},
{
"name": "Bambu PETG-CF @BBL P1P",
"sub_path": "filament/P1P/Bambu PETG-CF @BBL P1P.json"
},
{ {
"name": "Generic PVA @0.2 nozzle", "name": "Generic PVA @0.2 nozzle",
"sub_path": "filament/Generic PVA @0.2 nozzle.json" "sub_path": "filament/Generic PVA @0.2 nozzle.json"
@ -804,6 +820,14 @@
{ {
"name":"Bambu PLA-CF @BBL P1P 0.8 nozzle", "name":"Bambu PLA-CF @BBL P1P 0.8 nozzle",
"sub_path":"filament/P1P/Bambu PLA-CF @BBL P1P 0.8 nozzle.json" "sub_path":"filament/P1P/Bambu PLA-CF @BBL P1P 0.8 nozzle.json"
},
{
"name": "Bambu PET-CF @BBL X1C",
"sub_path": "filament/Bambu PET-CF @BBL X1C.json"
},
{
"name": "Bambu PET-CF @BBL P1P",
"sub_path": "filament/P1P/Bambu PET-CF @BBL P1P.json"
} }
], ],
"machine_list": [ "machine_list": [

11
resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json
View file

@ -1,6 +1,6 @@
{ {
"type": "filament", "type": "filament",
"setting_id": "GFST00", "setting_id": "GFST01",
"name": "Bambu PET-CF @BBL X1C", "name": "Bambu PET-CF @BBL X1C",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
@ -11,9 +11,6 @@
"reduce_fan_stop_start_freq": [ "reduce_fan_stop_start_freq": [
"0" "0"
], ],
"fan_cooling_layer_time": [
"4"
],
"slow_down_min_speed": [ "slow_down_min_speed": [
"20" "20"
], ],
@ -22,6 +19,10 @@
], ],
"compatible_printers": [ "compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle", "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"
] ]
} }

62
resources/profiles/BBL/filament/Bambu PET-CF @base.json
View file

@ -1,10 +1,58 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFT00", "filament_id": "GFT01",
"name": "Bambu PET-CF @base", "name": "Bambu PET-CF @base",
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_pet", "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": [ "required_nozzle_HRC": [
"40" "40"
], ],
@ -14,16 +62,22 @@
"filament_type": [ "filament_type": [
"PET-CF" "PET-CF"
], ],
"filament_cost": [
"84.99"
],
"filament_density": [
"1.29"
],
"nozzle_temperature_range_low": [ "nozzle_temperature_range_low": [
"260" "260"
], ],
"nozzle_temperature_range_high": [ "nozzle_temperature_range_high": [
"300" "290"
], ],
"nozzle_temperature_initial_layer": [ "nozzle_temperature_initial_layer": [
"280" "270"
], ],
"nozzle_temperature": [ "nozzle_temperature": [
"280" "270"
] ]
} }

16
resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json Normal file
View file

@ -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"
]
}

83
resources/profiles/BBL/filament/Bambu PETG-CF @base.json Normal file
View file

@ -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"
]
}

3
resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C.json
View file

@ -8,9 +8,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"15" "15"
], ],
"slow_down_layer_time": [
"2"
],
"nozzle_temperature_initial_layer": [ "nozzle_temperature_initial_layer": [
"230" "230"
], ],

3
resources/profiles/BBL/filament/Bambu PLA-CF @base.json
View file

@ -20,6 +20,9 @@
"required_nozzle_HRC": [ "required_nozzle_HRC": [
"40" "40"
], ],
"slow_down_layer_time": [
"8"
],
"nozzle_temperature_range_low": [ "nozzle_temperature_range_low": [
"210" "210"
], ],

39
resources/profiles/BBL/filament/Generic PETG-CF @base.json
View file

@ -1,10 +1,43 @@
{ {
"type": "filament", "type": "filament",
"filament_id": "GFG50", "filament_id": "GFG98",
"name": "Generic PETG-CF @base", "name": "Generic PETG-CF @base",
"from": "system", "from": "system",
"instantiation": "false", "instantiation": "false",
"inherits": "fdm_filament_pet", "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": [ "required_nozzle_HRC": [
"40" "40"
], ],
@ -30,7 +63,7 @@
"34.99" "34.99"
], ],
"filament_density": [ "filament_density": [
"1.04" "1.25"
], ],
"fan_max_speed": [ "fan_max_speed": [
"30" "30"
@ -39,7 +72,7 @@
"0" "0"
], ],
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"16" "10"
], ],
"slow_down_layer_time": [ "slow_down_layer_time": [
"6" "6"

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

@ -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"
]
}

2
resources/profiles/BBL/filament/Generic PLA Silk.json
View file

@ -4,7 +4,7 @@
"name": "Generic PLA Silk", "name": "Generic PLA Silk",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "Generic PLA @base", "inherits": "Generic PLA Silk @base",
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"7.5" "7.5"
], ],

25
resources/profiles/BBL/filament/P1P/Bambu PET-CF @BBL P1P.json Normal file
View file

@ -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"
]
}

13
resources/profiles/BBL/filament/P1P/Bambu PETG-CF @BBL P1P.json Normal file
View file

@ -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"
]
}

3
resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P.json
View file

@ -8,9 +8,6 @@
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"15" "15"
], ],
"slow_down_layer_time": [
"2"
],
"hot_plate_temp" : [ "hot_plate_temp" : [
"65" "65"
], ],

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

@ -17,6 +17,9 @@
"textured_plate_temp_initial_layer" : [ "textured_plate_temp_initial_layer" : [
"80" "80"
], ],
"filament_max_volumetric_speed": [
"1"
],
"compatible_printers": [ "compatible_printers": [
"Bambu Lab P1P 0.2 nozzle" "Bambu Lab P1P 0.2 nozzle"
] ]

2
resources/profiles/BBL/filament/P1P/Generic PLA Silk @BBL P1P.json
View file

@ -4,7 +4,7 @@
"name": "Generic PLA Silk @BBL P1P", "name": "Generic PLA Silk @BBL P1P",
"from": "system", "from": "system",
"instantiation": "true", "instantiation": "true",
"inherits": "Generic PLA @BBL P1P", "inherits": "Generic PLA Silk @base",
"filament_max_volumetric_speed": [ "filament_max_volumetric_speed": [
"7.5" "7.5"
], ],

4
src/libslic3r/GCode/WipeTower.cpp
View file

@ -49,7 +49,7 @@ public:
{ {
// adds tag for analyzer: // adds tag for analyzer:
std::ostringstream str; std::ostringstream str;
str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) << m_layer_height << "\n"; // don't rely on GCodeAnalyzer knowing the layer height - it knows nothing at priming str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) << std::to_string(m_layer_height) << "\n"; // don't rely on GCodeAnalyzer knowing the layer height - it knows nothing at priming
str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Role) << ExtrusionEntity::role_to_string(erWipeTower) << "\n"; str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Role) << ExtrusionEntity::role_to_string(erWipeTower) << "\n";
m_gcode += str.str(); m_gcode += str.str();
change_analyzer_line_width(line_width); change_analyzer_line_width(line_width);
@ -58,7 +58,7 @@ public:
WipeTowerWriter& change_analyzer_line_width(float line_width) { WipeTowerWriter& change_analyzer_line_width(float line_width) {
// adds tag for analyzer: // adds tag for analyzer:
std::stringstream str; std::stringstream str;
str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) << line_width << "\n"; str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) << std::to_string(line_width) << "\n";
m_gcode += str.str(); m_gcode += str.str();
return *this; return *this;
} }

3
src/slic3r/GUI/GUI_App.cpp
View file

@ -4404,7 +4404,8 @@ void GUI_App::start_sync_user_preset(bool load_immediately, bool with_progress_d
void GUI_App::stop_sync_user_preset() void GUI_App::stop_sync_user_preset()
{ {
remove_user_presets(); if (!wxGetApp().m_is_closing)
remove_user_presets();
enable_user_preset_folder(false); enable_user_preset_folder(false);
if (!enable_sync) if (!enable_sync)

4
version.inc
View file

@ -10,5 +10,5 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING) if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() endif()
set(SLIC3R_VERSION "01.05.00.59") set(SoftFever_VERSION "1.5.0_beta")
set(SoftFever_VERSION "1.4.5") set(SLIC3R_VERSION "01.05.00.60")