This commit is contained in:
SoftFever 2023-09-09 09:13:30 +08:00
parent ee4705d6b7
commit e624632969
142 changed files with 741 additions and 597 deletions

View file

@ -1369,17 +1369,6 @@ void PrintConfigDef::init_fff_params()
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 2. });
def = this->add("filament_minimal_purge_on_wipe_tower", coFloats);
def->label = L("Minimal purge on wipe tower");
def->tooltip = L("After a tool change, the exact position of the newly loaded filament inside "
"the nozzle may not be known, and the filament pressure is likely not yet stable. "
"Before purging the print head into an infill or a sacrificial object, Slic3r will always prime "
"this amount of material into the wipe tower to produce successive infill or sacrificial object extrusions reliably.");
def->sidetext = L("mm³");
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 15. });
def = this->add("machine_load_filament_time", coFloat);
def->label = L("Filament load time");
def->tooltip = L("Time to load new filament when switch filament. For statistics only");
@ -3197,7 +3186,21 @@ def = this->add("filament_loading_speed", coFloats);
def->label = L("Single Extruder Multi Material");
def->tooltip = L("Use single nozzle to print multi filament");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
def->readonly = true;
def->set_default_value(new ConfigOptionBool(true));
def = this->add("purge_in_prime_tower", coBool);
def->label = L("Purge in prime tower");
def->tooltip = L("Purge remaining filament into prime tower");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true));
def = this->add("enable_filament_ramming", coBool);
def->label = L("Enable filament ramming");
def->tooltip = L("Enable filament ramming");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true));
def = this->add("wipe_tower_no_sparse_layers", coBool);
def->label = L("No sparse layers (EXPERIMENTAL)");
@ -3853,7 +3856,7 @@ def = this->add("filament_loading_speed", coFloats);
def->label = L("Flush multiplier");
def->tooltip = L("The actual flushing volumes is equal to the flush multiplier multiplied by the flushing volumes in the table.");
def->sidetext = "";
def->set_default_value(new ConfigOptionFloat(1.0));
def->set_default_value(new ConfigOptionFloat(0.3));
// BBS
def = this->add("prime_volume", coFloat);
@ -3886,7 +3889,7 @@ def = this->add("filament_loading_speed", coFloats);
def->sidetext = L("mm");
def->min = 2.0;
def->mode = comSimple;
def->set_default_value(new ConfigOptionFloat(35.));
def->set_default_value(new ConfigOptionFloat(60.));
def = this->add("wipe_tower_rotation_angle", coFloat);
def->label = L("Wipe tower rotation angle");
@ -4912,7 +4915,9 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
}
} else if (opt_key == "overhang_fan_threshold" && value == "5%") {
value = "10%";
}
} else if(opt_key == "single_extruder_multi_material") {
value = "1";
}
// Ignore the following obsolete configuration keys:
static std::set<std::string> ignore = {