ENH: refine the logic of extruder_clearance_radius

1. use extruder_clearance_max_radius instead
2. set the value of P1P/P1S to the same value of X1C
JIRA: STUDIO-4214

Change-Id: I1ae5e4203db0933854b4388b5505dbf34b40edae
(cherry picked from commit 19cb6a0fbad0192d39813e449baed090baa163c5)
This commit is contained in:
lane.wei 2023-08-24 22:05:19 +08:00 committed by Lane.Wei
parent 5957912eaa
commit 6d5fad236e
5 changed files with 8 additions and 10 deletions

View file

@ -4321,7 +4321,7 @@ double min_object_distance(const ConfigBase &cfg)
else {
//BBS: duplicate_distance seam to be useless
constexpr double duplicate_distance = 6.;
auto ecr_opt = cfg.option<ConfigOptionFloat>("extruder_clearance_radius");
auto ecr_opt = cfg.option<ConfigOptionFloat>("extruder_clearance_max_radius");
auto co_opt = cfg.option<ConfigOptionEnum<PrintSequence>>("print_sequence");
if (!ecr_opt || !co_opt)
@ -4744,8 +4744,8 @@ std::map<std::string, std::string> validate(const FullPrintConfig &cfg, bool und
}
// extruder clearance
if (cfg.extruder_clearance_radius <= 0) {
error_message.emplace("extruder_clearance_radius", L("invalid value ") + std::to_string(cfg.extruder_clearance_radius));
if (cfg.extruder_clearance_max_radius <= 0) {
error_message.emplace("extruder_clearance_max_radius", L("invalid value ") + std::to_string(cfg.extruder_clearance_max_radius));
}
if (cfg.extruder_clearance_height_to_rod <= 0) {
error_message.emplace("extruder_clearance_height_to_rod", L("invalid value ") + std::to_string(cfg.extruder_clearance_height_to_rod));