3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-24 01:01:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix of the wipe tower starting point

Browse source 
see issues #2968, #3234 and #3248
This commit is contained in:
Lukas Matena 2019-12-04 13:40:16 +01:00
parent 3ef34848c7
commit 4ba7cb7ede
3 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1004,9 +1004,10 @@ void WipeTower::toolchange_Change(
writer.append("[toolchange_gcode]\n");
// Travel to where we assume we are. Custom toolchange or some special T code handling (parking extruder etc)
// gcode could have left the extruder somewhere, we cannot just start extruding.
Vec2f current_pos = writer.pos_rotated();
writer.append(std::string("G1 X") + std::to_string(current_pos.x()) + " Y" + std::to_string(current_pos.y()) + "\n");
// gcode could have left the extruder somewhere, we cannot just start extruding. We should also inform the
// postprocessor that we absolutely want to have this in the gcode, even if it thought it is the same as before.
Vec2f current_pos = writer.pos_rotated();
writer.append(std::string("G1 X") + std::to_string(current_pos.x()) + " Y" + std::to_string(current_pos.y()) + never_skip_tag() + "\n");
// The toolchange Tn command will be inserted later, only in case that the user does
// not provide a custom toolchange gcode.

5
src/libslic3r/GCode/WipeTower.hpp
View file

@ -17,9 +17,12 @@ class PrintConfig;
enum GCodeFlavor : unsigned char;
class WipeTower
{
public:
static char const* never_skip_tag() { return "_GCODE_WIPE_TOWER_NEVER_SKIP_TAG"; }
struct Extrusion
{
Extrusion(const Vec2f &pos, float width, unsigned int tool) : pos(pos), width(width), tool(tool) {}
@ -96,6 +99,8 @@ public:
// Switch to a next layer.
void set_layer(
// Print height of this layer.