Merge remote-tracking branch 'remotes/origin/master' into dev

This commit is contained in:
bubnikv committed 2019-09-12 10:19:09 +02:00
commit b4f2df6a98
30 files changed
+635 -904

No files matched your search

+4 -1
View File
@@ -529,7 +529,10 @@ void GCodeAnalyzer::_processT(const std::string& cmd)
if (_get_extruder_id() != id)
{
if (id >= m_extruders_count)
BOOST_LOG_TRIVIAL(error) << "GCodeAnalyzer encountered an invalid toolchange, maybe from a custom gcode.";
{
if (m_extruders_count > 1)
BOOST_LOG_TRIVIAL(error) << "GCodeAnalyzer encountered an invalid toolchange, maybe from a custom gcode.";
}
else
_set_extruder_id(id);