From 99012660c975e63e693b1ed6b4bb8a4f9e62c652 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 28 Oct 2023 22:52:16 +0800 Subject: [PATCH] Don't show not consistent g-code warning for P1P machine when P1S profiles are used. --- src/slic3r/GUI/SelectMachine.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 5593515d54..2119632d38 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2244,9 +2244,13 @@ bool SelectMachineDialog::is_same_printer_model() } PresetBundle* preset_bundle = wxGetApp().preset_bundle; - if (preset_bundle && preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle) != obj_->printer_type) { - BOOST_LOG_TRIVIAL(info) << "printer_model: source = " << preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle); - BOOST_LOG_TRIVIAL(info) << "printer_model: target = " << obj_->printer_type; + if(preset_bundle == nullptr) return result; + const auto source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle); + const auto target_model = obj_->printer_type; + // Orca: ignore P1P -> P1S + if (source_model != target_model && !(target_model == "C11" && source_model == "C12")) { + BOOST_LOG_TRIVIAL(info) << "printer_model: source = " << source_model; + BOOST_LOG_TRIVIAL(info) << "printer_model: target = " << target_model; return false; }