3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-28 10:20:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ENH: remove the appended T cmd after change filament

Browse source 
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Id5da64626b7343a71dcb38c06f5b5caf43ec40e2
(cherry picked from commit 7da565f0582f470274d279e52daf0dd889f0de7d)
This commit is contained in:
qing.zhang 2024-06-13 16:03:24 +08:00 • committed by Noisyfox
parent 95a5914c26
commit bba00b2e7a
4 changed files with 68 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/libslic3r/GCode/GCodeProcessor.cpp
View file

@ -1736,8 +1736,27 @@ void GCodeProcessor::process_gcode_line(const GCodeReader::GCodeLine& line, bool
break;
}
break;
default:
break;
case 5:
switch (cmd[1]) {
case '1':
switch (cmd[2]) {
case '0':
switch (cmd[3]) {
case '2':
switch (cmd[4]) {
case '0': {
process_M1020(line); // Select Tool
break;
}
default: break;
}
default: break;
}
default: break;
}
default: break;
}
default: break;
}
break;
case 't':
@ -3962,6 +3981,42 @@ void GCodeProcessor::process_T(const GCodeReader::GCodeLine& line)
process_T(line.cmd());
}
void GCodeProcessor::process_M1020(const GCodeReader::GCodeLine &line)
{
if (line.raw().length() > 5) {
std::string filament_id = line.raw().substr(7);
if (filament_id.empty())
return;
int eid = 0;
eid = std::stoi(filament_id);
if (eid < 0 || eid > 254) {
// M1020-1 is a valid gcode line for RepRap Firmwares (used to deselects all tools)
if ((m_flavor != gcfRepRapFirmware && m_flavor != gcfRepRapSprinter) || eid != -1)
BOOST_LOG_TRIVIAL(error) << "Invalid M1020 command (" << line.raw() << ").";
} else {
unsigned char id = static_cast<unsigned char>(eid);
if (m_extruder_id != id) {
if (id >= m_result.extruders_count)
BOOST_LOG_TRIVIAL(error) << "Invalid M1020 command (" << line.raw() << ").";
else {
m_last_extruder_id = m_extruder_id;
process_filaments(CustomGCode::ToolChange);
m_extruder_id = id;
m_cp_color.current = m_extruder_colors[id];
// BBS: increase filament change times
m_result.lock();
m_result.print_statistics.total_filamentchanges++;
m_result.unlock();
}
// store tool change move
store_move_vertex(EMoveType::Tool_change);
}
}
}
}
void GCodeProcessor::process_T(const std::string_view command)
{
unsigned int new_extruder = 0;