Merge branch 'main' into feature/multitool

This commit is contained in:
SoftFever 2024-07-16 23:30:26 +08:00 committed by GitHub
commit a9668728bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
223 changed files with 10502 additions and 2428 deletions

View file

@ -1466,7 +1466,7 @@ WipeTower::ToolChangeResult WipeTower2::finish_layer()
return poly;
};
feedrate = first_layer ? m_first_layer_speed * 60.f : m_perimeter_speed * 60.f;
feedrate = first_layer ? m_first_layer_speed * 60.f : std::min(m_wipe_tower_max_purge_speed * 60.f, m_perimeter_speed * 60.f);
// outer contour (always)
bool infill_cone = first_layer && m_wipe_tower_width > 2*spacing && m_wipe_tower_depth > 2*spacing;