Removed default mode which is no more used

wawanbreton · Jan 10, 2024 · 0511c4b · 0511c4b
1 parent 284d171
commit 0511c4b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git 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
@@ -1526,18 +1526,6 @@ std::vector<ExtruderUse>
         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
@@ -165,7 +165,7 @@ void PrimeTower::generatePaths_denseInfill(std::vector<coord_t>& 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
@@ -682,11 +682,7 @@ template<>
 PrimeTowerMethod Settings::get<PrimeTowerMethod>(const std::string& key) const
 {
     const std::string& value = get<std::string>(key);
-    if (value == "default")
-    {
-        return PrimeTowerMethod::DEFAULT;
-    }
-    else if (value == "optimized")
+    if (value == "optimized")
     {
         return PrimeTowerMethod::OPTIMIZED;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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.
          */
@@ Expand Down @@