GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 19:40:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to output correct set & wait gcode for Sailfish and MakerWare.

Browse Source 
Fixes #3546 and reimplements #3547
This commit is contained in:
Joseph Lenox 2016-11-08 10:13:28 -06:00
parent 8910b4970a
commit 11fa9e47ab
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xs/src/libslic3r/GCodeWriter.cpp
View File

@ -78,11 +78,9 @@ GCodeWriter::postamble() const
std::string std::string
GCodeWriter::set_temperature(unsigned int temperature, bool wait, int tool) const GCodeWriter::set_temperature(unsigned int temperature, bool wait, int tool) const
{ {
if (wait && (FLAVOR_IS(gcfMakerWare) || FLAVOR_IS(gcfSailfish)))
return "";
std::string code, comment; std::string code, comment;
if (wait && FLAVOR_IS_NOT(gcfTeacup)) { if (wait && FLAVOR_IS_NOT(gcfTeacup) && FLAVOR_IS_NOT(gcfMakerWare) && FLAVOR_IS_NOT(gcfSailfish)) {
code = "M109"; code = "M109";
comment = "set temperature and wait for it to be reached"; comment = "set temperature and wait for it to be reached";
} else { } else {
@ -106,6 +104,9 @@ GCodeWriter::set_temperature(unsigned int temperature, bool wait, int tool) cons
if (FLAVOR_IS(gcfTeacup) && wait) if (FLAVOR_IS(gcfTeacup) && wait)
gcode << "M116 ; wait for temperature to be reached\n"; gcode << "M116 ; wait for temperature to be reached\n";
if (wait && tool !=-1 && (FLAVOR_IS(gcfMakerWare) || FLAVOR_IS(gcfSailfish)))
gcode << "M6 T" << tool << " ; wait for temperature to be reached\n";
return gcode.str(); return gcode.str();
} }