3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Process_T

Browse source
This commit is contained in:
SoftFever 2023-10-30 00:09:01 +08:00
parent 338f4609f3
commit 6fe5abc8cc
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,8 @@
#include <float.h> #include <float.h>
#include <assert.h> #include <assert.h>
#include <regex> #include <regex>
#include <charconv>
#include <system_error>
#if __has_include(<charconv>) #if __has_include(<charconv>)
#include <charconv> #include <charconv>
@ -4061,19 +4063,23 @@ void GCodeProcessor::process_T(const GCodeReader::GCodeLine& line)
void GCodeProcessor::process_T(const std::string_view command) void GCodeProcessor::process_T(const std::string_view command)
{ {
unsigned int new_extruder = 0;
auto ret = std::from_chars(command.data() + 1, command.data()+command.size(), new_extruder);
if (std::errc::invalid_argument == ret.ec)
return;
if (command.length() > 1) { if (command.length() > 1) {
int eid = 0; if (new_extruder < 0 || new_extruder > 254) {
if (! parse_number(command.substr(1), eid) || eid < 0 || eid > 254) {
//BBS: T255, T1000 and T1100 is used as special command for BBL machine and does not cost time. return directly //BBS: T255, T1000 and T1100 is used as special command for BBL machine and does not cost time. return directly
if ((m_flavor == gcfMarlinLegacy || m_flavor == gcfMarlinFirmware) && (command == "Tx" || command == "Tc" || command == "T?" || if ((m_flavor == gcfMarlinLegacy || m_flavor == gcfMarlinFirmware) && (command == "Tx" || command == "Tc" || command == "T?" ||
eid == 1000 || eid == 1100 || eid == 255)) new_extruder == 1000 || new_extruder == 1100 || new_extruder == 255))
return; return;
// T-1 is a valid gcode line for RepRap Firmwares (used to deselects all tools) // T-1 is a valid gcode line for RepRap Firmwares (used to deselects all tools)
if ((m_flavor != gcfRepRapFirmware && m_flavor != gcfRepRapSprinter) || eid != -1) if ((m_flavor != gcfRepRapFirmware && m_flavor != gcfRepRapSprinter) || new_extruder != -1)
BOOST_LOG_TRIVIAL(error) << "Invalid T command (" << command << ")."; BOOST_LOG_TRIVIAL(error) << "Invalid T command (" << command << ").";
} else { } else {
unsigned char id = static_cast<unsigned char>(eid); unsigned char id = static_cast<unsigned char>(new_extruder);
if (m_extruder_id != id) { if (m_extruder_id != id) {
if (id >= m_result.extruders_count) if (id >= m_result.extruders_count)
BOOST_LOG_TRIVIAL(error) << "Invalid T command (" << command << ")."; BOOST_LOG_TRIVIAL(error) << "Invalid T command (" << command << ").";