Changed handling of priming extrusions to allow injection of filament and toolchange custom gcodes

The priming extrusions were handled separately from the rest of the wipe tower toolchanges. In order to be able to use the logic from previous commit for them (custom toolchange gcodes etc), some unpleasant code shuffling was needed
This commit is contained in:
Lukas Matena 2019-06-14 12:28:24 +02:00
parent 41164a9cb3
commit aee376762e
9 changed files with 146 additions and 92 deletions

View file

@ -1824,7 +1824,7 @@ void Print::_make_wipe_tower()
m_config.filament_max_volumetric_speed.get_at(i),
m_config.nozzle_diameter.get_at(i));
m_wipe_tower_data.priming = Slic3r::make_unique<WipeTower::ToolChangeResult>(
m_wipe_tower_data.priming = Slic3r::make_unique<std::vector<WipeTower::ToolChangeResult>>(
wipe_tower.prime(this->skirt_first_layer_height(), m_wipe_tower_data.tool_ordering.all_extruders(), false));
// Lets go through the wipe tower layers and determine pairs of extruder changes for each