From 0511c4bcf84433207d0dcb10f4cf7f1a072ffda1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 10 Jan 2024 17:20:30 +0100 Subject: [PATCH] Removed default mode which is no more used --- include/settings/EnumSettings.h | 5 ----- src/FffGcodeWriter.cpp | 12 ------------ src/PrimeTower.cpp | 2 +- src/settings/Settings.cpp | 6 +----- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/include/settings/EnumSettings.h b/include/settings/EnumSettings.h index 1ea3e1e099..ccec9c4f7d 100644 --- a/include/settings/EnumSettings.h +++ b/include/settings/EnumSettings.h @@ -255,11 +255,6 @@ enum class PrimeTowerMethod */ NONE, - /*! - * Basic full prime tower with only discs. - */ - DEFAULT, - /*! * Prime tower that minimizes time and used filament as much as possible. */ diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp index a603aaf962..70bf3444fa 100644 --- a/src/FffGcodeWriter.cpp +++ b/src/FffGcodeWriter.cpp @@ -1526,18 +1526,6 @@ std::vector case PrimeTowerMethod::NONE: break; - case PrimeTowerMethod::DEFAULT: - if (extruder_nr == storage.primeTower.extruder_order_[0] && layer_nr >= 0 && layer_nr <= storage.max_print_height_second_to_last_extruder) - { - // The outermost prime tower extruder is always used if there is a prime tower, apart on layers with negative index (e.g. for the raft) - prime = ExtruderPrime::Prime; - } - else if (extruder_is_used_on_this_layer[extruder_nr]) - { - prime = ExtruderPrime::Prime; - } - break; - case PrimeTowerMethod::OPTIMIZED_CONSISTENT: if (extruder_is_used_on_this_layer[extruder_nr] && extruder_nr != last_extruder) { diff --git a/src/PrimeTower.cpp b/src/PrimeTower.cpp index ce546fd0e3..f06e3d1ff8 100644 --- a/src/PrimeTower.cpp +++ b/src/PrimeTower.cpp @@ -165,7 +165,7 @@ void PrimeTower::generatePaths_denseInfill(std::vector& cumulative_inse // Generate the base outside extra rings if ((method == PrimeTowerMethod::OPTIMIZED - || (extruder_nr == extruder_order_.front() && (method == PrimeTowerMethod::OPTIMIZED_CONSISTENT || method == PrimeTowerMethod::DEFAULT))) + || (extruder_nr == extruder_order_.front() && method == PrimeTowerMethod::OPTIMIZED_CONSISTENT)) && (base_enabled || has_raft) && base_extra_radius > 0 && base_height > 0) { for (coord_t z = 0; z < base_height; z += layer_height) diff --git a/src/settings/Settings.cpp b/src/settings/Settings.cpp index e2b60aa791..0efd915d9d 100644 --- a/src/settings/Settings.cpp +++ b/src/settings/Settings.cpp @@ -682,11 +682,7 @@ template<> PrimeTowerMethod Settings::get(const std::string& key) const { const std::string& value = get(key); - if (value == "default") - { - return PrimeTowerMethod::DEFAULT; - } - else if (value == "optimized") + if (value == "optimized") { return PrimeTowerMethod::OPTIMIZED; }