From 4cb3a63c78a202e7f4b66250ba94a6350c2bd8d3 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Sun, 27 Apr 2025 14:08:35 +0800 Subject: [PATCH] FIX: modify the default k value for display jira: none Change-Id: Ib92bf722f21994db02dac5b162215709090d786a --- src/slic3r/Utils/CalibUtils.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 65362b187..a44cf2c68 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -38,24 +38,27 @@ std::vector not_support_auto_pa_cali_filaments = { void get_default_k_n_value(const std::string &filament_id, float &k, float &n) { - if (filament_id.compare("GFG00") == 0) { - // PETG - k = 0.04; + if (filament_id.compare("GFU01") == 0) { + /* TPU 95A */ + k = 0.25; n = 1.0; - } else if (filament_id.compare("GFB00") == 0 || filament_id.compare("GFB50") == 0) { - // ABS - k = 0.04; + } else if (filament_id.compare("GFU03") == 0) { + /* TPU 90A */ + k = 0.35; n = 1.0; - } else if (filament_id.compare("GFU01") == 0) { - // TPU - k = 0.2; + } else if (filament_id.compare("GFU04") == 0) { + /* TPU 85A */ + k = 0.65; n = 1.0; - } else if (filament_id.compare("GFB01") == 0) { - // ASA + } else if (filament_id.compare("GFG00") == 0 || filament_id.compare("GFG01") == 0 || filament_id.compare("GFG60") == 0 || filament_id.compare("GFL06") == 0 || + filament_id.compare("GFL55") == 0 || filament_id.compare("GFG99") == 0 || filament_id.compare("GFG98") == 0 || filament_id.compare("GFG97") == 0 || + filament_id.compare("GFG50") == 0 || filament_id.compare("GFU02") == 0 || filament_id.compare("GFU98") == 0 || filament_id.compare("GFS00") == 0 || + filament_id.compare("GFS02") == 0) { + /* 0.04 filaments */ k = 0.04; n = 1.0; } else { - // PLA , other + /* other */ k = 0.02; n = 1.0; }