Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsupermerill <merill@free.fr>2022-03-11 19:51:37 +0300
committersupermerill <merill@free.fr>2022-03-11 19:51:37 +0300
commitc8360385914077c4773dfec71b74734052c16a66 (patch)
tree3d943c8010fb74c71fea859e5059dca6ad033a63 /src/libslic3r/PrintConfig.cpp
parentd9e991e195fc34bd933d7cca8cbafb4eafcdafc7 (diff)
Allow m117 & M73 at the same time
also fix M117 supermerill/SuperSlicer#1940
Diffstat (limited to 'src/libslic3r/PrintConfig.cpp')
-rw-r--r--src/libslic3r/PrintConfig.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index b1f19f0c3..78d6fa0d0 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -238,6 +238,7 @@ static const t_config_enum_values s_keys_map_RemainingTimeType{
{ "m117", rtM117 },
{ "m73", rtM73 },
{ "m73q", rtM73_Quiet },
+ { "m73m117", rtM73_M117 },
{ "none", rtNone },
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(RemainingTimeType)
@@ -3112,8 +3113,10 @@ void PrintConfigDef::init_fff_params()
def->enum_keys_map = &ConfigOptionEnum<RemainingTimeType>::get_enum_values();
def->enum_values.push_back("m117");
def->enum_values.push_back("m73");
+ def->enum_values.push_back("m73m117");
def->enum_labels.push_back(L("M117"));
def->enum_labels.push_back(L("M73"));
+ def->enum_labels.push_back(L("M73 & M117"));
def->set_default_value(new ConfigOptionEnum<RemainingTimeType>(RemainingTimeType::rtM73));
def = this->add("silent_mode", coBool);