juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-30 14:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.3' into dev_upgrade_alves

Browse Source
This commit is contained in:
alves
2026-01-30 17:54:49 +08:00
parent 5494f27b44 ecabe58209
commit 82def51f0b
5 changed files with 440 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libslic3r/GCode/WipeTower2.cpp
View File

@@ -1354,10 +1354,9 @@ void WipeTower2::set_extruder(size_t idx, const PrintConfig& config)
m_filpar.push_back(FilamentParameters());
m_filpar[idx].material = config.filament_type.get_at(idx);
// m_filpar[idx].is_soluble = config.filament_soluble.get_at(idx);
m_filpar[idx].is_soluble = config.wipe_tower_filament == 0 ? config.filament_soluble.get_at(idx) :
(idx != size_t(config.wipe_tower_filament - 1));
m_filpar[idx].temperature = config.nozzle_temperature.get_at(idx);
m_filpar[idx].is_soluble = config.wipe_tower_filament == 0 ? config.filament_soluble.get_at(idx) :
(idx != size_t(config.wipe_tower_filament - 1));
m_filpar[idx].temperature = config.nozzle_temperature.get_at(idx);
m_filpar[idx].first_layer_temperature = config.nozzle_temperature_initial_layer.get_at(idx);
m_filpar[idx].filament_minimal_purge_on_wipe_tower = config.filament_minimal_purge_on_wipe_tower.get_at(idx);
@@ -2329,7 +2328,12 @@ void WipeTower2::generate(std::vector<std::vector<WipeTower::ToolChangeResult>>&
return;
plan_tower();
#if 1
#if 0
// BBS: Disabled 5-iteration loop - matching Bambu Studio's approach
// This loop causes instability in depth calculations which leads to out-of-bounds coordinates
// The loop recalculates required_depth in save_on_last_wipe() and propagates it downward via plan_tower()
// After multiple iterations, depth can exceed reasonable bounds, causing m_y_shift to change
// This in turn causes the rotate() function to generate negative coordinates
for (int i = 0; i < 5; ++i) {
save_on_last_wipe();
plan_tower();

1
src/libslic3r/PrintConfig.cpp
View File

@@ -2319,7 +2319,6 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("PVB");
def->enum_values.push_back("SBS");
def->enum_values.push_back("TPU");
def->enum_values.push_back("PETG-HF");
def->mode = comSimple;
def->set_default_value(new ConfigOptionStrings { "PLA" });