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

#8941 - GCodeViewer - Extended processing of line G10 for RepRap firmware (set tool temperature)

Browse Source
This commit is contained in:
enricoturri1966 2022-09-26 09:38:08 +02:00
parent 7a1c118924
commit f19882749f
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -1769,7 +1769,7 @@ void GCodeProcessor::process_gcode_line(const GCodeReader::GCodeLine& line, bool
switch (cmd[1]) { switch (cmd[1]) {
case '1': case '1':
switch (cmd[2]) { switch (cmd[2]) {
case '0': { process_G10(line); break; } // Retract case '0': { process_G10(line); break; } // Retract or Set tool temperature
case '1': { process_G11(line); break; } // Unretract case '1': { process_G11(line); break; } // Unretract
default: break; default: break;
} }
@ -3232,6 +3232,23 @@ void GCodeProcessor::process_G2_G3(const GCodeReader::GCodeLine& line, bool cloc
void GCodeProcessor::process_G10(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_G10(const GCodeReader::GCodeLine& line)
{ {
if (m_flavor == gcfRepRapFirmware) {
// similar to M104/M109
float new_temp;
if (line.has_value('S', new_temp)) {
size_t id = m_extruder_id;
float val;
if (line.has_value('P', val)) {
const size_t eid = static_cast<size_t>(val);
if (eid < m_extruder_temps.size())
id = eid;
}
m_extruder_temps[id] = new_temp;
return;
}
}
// stores retract move // stores retract move
store_move_vertex(EMoveType::Retract); store_move_vertex(EMoveType::Retract);
} }
@ -3441,18 +3458,22 @@ void GCodeProcessor::process_M108(const GCodeReader::GCodeLine& line)
void GCodeProcessor::process_M109(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_M109(const GCodeReader::GCodeLine& line)
{ {
float new_temp; float new_temp;
size_t id = (size_t)-1;
if (line.has_value('R', new_temp)) { if (line.has_value('R', new_temp)) {
float val; float val;
if (line.has_value('T', val)) { if (line.has_value('T', val)) {
const size_t eid = static_cast<size_t>(val); const size_t eid = static_cast<size_t>(val);
if (eid < m_extruder_temps.size()) if (eid < m_extruder_temps.size())
m_extruder_temps[eid] = new_temp; id = eid;
} }
else else
m_extruder_temps[m_extruder_id] = new_temp; id = m_extruder_id;
} }
else if (line.has_value('S', new_temp)) else if (line.has_value('S', new_temp))
m_extruder_temps[m_extruder_id] = new_temp; id = m_extruder_id;
if (id != (size_t)-1)
m_extruder_temps[id] = new_temp;
} }
void GCodeProcessor::process_M132(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_M132(const GCodeReader::GCodeLine& line)

2
src/libslic3r/GCode/GCodeProcessor.hpp
View File

@ -674,7 +674,7 @@ namespace Slic3r {
void process_G2_G3(const GCodeReader::GCodeLine& line, bool clockwise); void process_G2_G3(const GCodeReader::GCodeLine& line, bool clockwise);
#endif // ENABLE_PROCESS_G2_G3_LINES #endif // ENABLE_PROCESS_G2_G3_LINES
// Retract // Retract or Set tool temperature
void process_G10(const GCodeReader::GCodeLine& line); void process_G10(const GCodeReader::GCodeLine& line);
// Unretract // Unretract