GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 08:55:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for M73 for silent mode

Browse Source 
Fix 7ac7a0a
supermerill/SuperSlicer/issues/1819
This commit is contained in:
supermerill 2021-11-07 16:34:51 +01:00
parent 226da3b862
commit bf3b9acec8
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -374,14 +374,19 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
ret += (boost::format("M73 P%1% R%2%\n") ret += (boost::format("M73 P%1% R%2%\n")
% std::to_string((line == First_Line_M73_Placeholder_Tag) ? 0 : 100) % std::to_string((line == First_Line_M73_Placeholder_Tag) ? 0 : 100)
% std::to_string((line == First_Line_M73_Placeholder_Tag) ? time_in_minutes(machine.time) : 0)).str(); % std::to_string((line == First_Line_M73_Placeholder_Tag) ? time_in_minutes(machine.time) : 0)).str();
} else if (machine.remaining_times_type == rtM73_Quiet) {
ret += (boost::format("M73 Q%1% S%2%\n")
% std::to_string((line == First_Line_M73_Placeholder_Tag) ? 0 : 100)
% std::to_string((line == First_Line_M73_Placeholder_Tag) ? time_in_minutes(machine.time) : 0)).str();
} else if (machine.remaining_times_type == rtM117) { } else if (machine.remaining_times_type == rtM117) {
if((line == First_Line_M73_Placeholder_Tag)) if ((line == First_Line_M73_Placeholder_Tag))
ret += (boost::format("M117 Time Left %1%h%2%m%3%s\n") ret += (boost::format("M117 Time Left %1%h%2%m%3%s\n")
% std::to_string(int32_t(machine.time) / 3600) % std::to_string(int32_t(machine.time / 60) % 60) % std::to_string(int32_t(machine.time) % 60) % std::to_string(int32_t(machine.time) / 3600) % std::to_string(int32_t(machine.time / 60) % 60) % std::to_string(int32_t(machine.time) % 60)
).str(); ).str();
else else
ret += "M117 Time Left 0s\n"; ret += "M117 Time Left 0s\n";
} }
//else none
} }
} }
} }
@ -439,6 +444,10 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
export_line += (boost::format("M73 P%1% R%2%\n") export_line += (boost::format("M73 P%1% R%2%\n")
% std::to_string(to_export.first) % std::to_string(to_export.first)
% std::to_string(to_export.second)).str(); % std::to_string(to_export.second)).str();
} else if (machine.remaining_times_type == rtM73_Quiet) {
export_line += (boost::format("M73 Q%1% S%2%\n")
% std::to_string(to_export.first)
% std::to_string(to_export.second)).str();
} else if (machine.remaining_times_type == rtM117) { } else if (machine.remaining_times_type == rtM117) {
export_line += (boost::format("M117 Time Left %1%h%2%m%3%s\n") export_line += (boost::format("M117 Time Left %1%h%2%m%3%s\n")
% std::to_string(int32_t(machine.time - elapsed_time) / 3600) % std::to_string((int32_t(machine.time - elapsed_time) / 60) % 60) % std::to_string(int32_t(machine.time - elapsed_time) % 60) % std::to_string(int32_t(machine.time - elapsed_time) / 3600) % std::to_string((int32_t(machine.time - elapsed_time) / 60) % 60) % std::to_string(int32_t(machine.time - elapsed_time) % 60)
@ -594,7 +603,7 @@ void GCodeProcessor::apply_config(const PrintConfig& config)
} }
m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Normal)].remaining_times_type = config.remaining_times_type.value; m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Normal)].remaining_times_type = config.remaining_times_type.value;
m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Stealth)].remaining_times_type = config.remaining_times_type.value; m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Stealth)].remaining_times_type = config.remaining_times_type.value == rtM73 ? rtM73_Quiet : rtNone;
} }
@ -794,7 +803,7 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
const ConfigOptionEnum<RemainingTimeType>* remaining_times_type = config.option<ConfigOptionEnum<RemainingTimeType>>("remaining_times_type"); const ConfigOptionEnum<RemainingTimeType>* remaining_times_type = config.option<ConfigOptionEnum<RemainingTimeType>>("remaining_times_type");
if (remaining_times_type) { if (remaining_times_type) {
m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Normal)].remaining_times_type = remaining_times_type->value; m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Normal)].remaining_times_type = remaining_times_type->value;
m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Stealth)].remaining_times_type = remaining_times_type->value; m_time_processor.machines[static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Stealth)].remaining_times_type = remaining_times_type->value == rtM73 ? rtM73_Quiet : rtNone;
} }
} }

6
src/libslic3r/PrintConfig.hpp
View File

@ -135,6 +135,8 @@ enum InfillConnection {
enum RemainingTimeType { enum RemainingTimeType {
rtM117, rtM117,
rtM73, rtM73,
rtM73_Quiet,
rtNone,
}; };
enum SupportZDistanceType { enum SupportZDistanceType {
@ -342,7 +344,9 @@ template<> inline const t_config_enum_values& ConfigOptionEnum<InfillConnection>
template<> inline const t_config_enum_values& ConfigOptionEnum<RemainingTimeType>::get_enum_values() { template<> inline const t_config_enum_values& ConfigOptionEnum<RemainingTimeType>::get_enum_values() {
static const t_config_enum_values keys_map = { static const t_config_enum_values keys_map = {
{ "m117", rtM117 }, { "m117", rtM117 },
{ "m73", rtM73 } { "m73", rtM73 },
{ "m73q", rtM73_Quiet },
{ "none", rtNone }
}; };
return keys_map; return keys_map;
} }