Browse Source

🧑‍💻 EXTRUDER_LOOP macro

Scott Lahteine 3 years ago
parent
commit
a80a303cbe

+ 10
- 10
Marlin/src/feature/fwretract.cpp View File

@@ -73,10 +73,10 @@ void FWRetract::reset() {
73 73
   settings.swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
74 74
   current_hop = 0.0;
75 75
 
76
-  LOOP_L_N(i, EXTRUDERS) {
77
-    retracted[i] = false;
78
-    E_TERN_(retracted_swap[i] = false);
79
-    current_retract[i] = 0.0;
76
+  EXTRUDER_LOOP() {
77
+    retracted[e] = false;
78
+    E_TERN_(retracted_swap[e] = false);
79
+    current_retract[e] = 0.0;
80 80
   }
81 81
 }
82 82
 
@@ -111,10 +111,10 @@ void FWRetract::retract(const bool retracting E_OPTARG(bool swapping/*=false*/))
111 111
       " swapping ", swapping,
112 112
       " active extruder ", active_extruder
113 113
     );
114
-    LOOP_L_N(i, EXTRUDERS) {
115
-      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
114
+    EXTRUDER_LOOP() {
115
+      SERIAL_ECHOLNPGM("retracted[", e, "] ", AS_DIGIT(retracted[e]));
116 116
       #if HAS_MULTI_EXTRUDER
117
-        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
117
+        SERIAL_ECHOLNPGM("retracted_swap[", e, "] ", AS_DIGIT(retracted_swap[e]));
118 118
       #endif
119 119
     }
120 120
     SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
@@ -184,10 +184,10 @@ void FWRetract::retract(const bool retracting E_OPTARG(bool swapping/*=false*/))
184 184
     SERIAL_ECHOLNPGM("retracting ", AS_DIGIT(retracting));
185 185
     SERIAL_ECHOLNPGM("swapping ", AS_DIGIT(swapping));
186 186
     SERIAL_ECHOLNPGM("active_extruder ", active_extruder);
187
-    LOOP_L_N(i, EXTRUDERS) {
188
-      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
187
+    EXTRUDER_LOOP() {
188
+      SERIAL_ECHOLNPGM("retracted[", e, "] ", AS_DIGIT(retracted[e]));
189 189
       #if HAS_MULTI_EXTRUDER
190
-        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
190
+        SERIAL_ECHOLNPGM("retracted_swap[", e, "] ", AS_DIGIT(retracted_swap[e]));
191 191
       #endif
192 192
     }
193 193
     SERIAL_ECHOLNPGM("current_position.z ", current_position.z);

+ 1
- 1
Marlin/src/feature/fwretract.h View File

@@ -64,7 +64,7 @@ public:
64 64
   static void reset();
65 65
 
66 66
   static void refresh_autoretract() {
67
-    LOOP_L_N(i, EXTRUDERS) retracted[i] = false;
67
+    EXTRUDER_LOOP() retracted[e] = false;
68 68
   }
69 69
 
70 70
   static void enable_autoretract(const bool enable) {

+ 5
- 5
Marlin/src/feature/powerloss.cpp View File

@@ -196,7 +196,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
196 196
     #if DISABLED(NO_VOLUMETRICS)
197 197
       info.flag.volumetric_enabled = parser.volumetric_enabled;
198 198
       #if HAS_MULTI_EXTRUDER
199
-        for (int8_t e = 0; e < EXTRUDERS; e++) info.filament_size[e] = planner.filament_size[e];
199
+        EXTRUDER_LOOP() info.filament_size[e] = planner.filament_size[e];
200 200
       #else
201 201
         if (parser.volumetric_enabled) info.filament_size[0] = planner.filament_size[active_extruder];
202 202
       #endif
@@ -461,7 +461,7 @@ void PrintJobRecovery::resume() {
461 461
   // Recover volumetric extrusion state
462 462
   #if DISABLED(NO_VOLUMETRICS)
463 463
     #if HAS_MULTI_EXTRUDER
464
-      for (int8_t e = 0; e < EXTRUDERS; e++) {
464
+      EXTRUDER_LOOP() {
465 465
         sprintf_P(cmd, PSTR("M200T%iD%s"), e, dtostrf(info.filament_size[e], 1, 3, str_1));
466 466
         gcode.process_subcommands_now(cmd);
467 467
       }
@@ -511,7 +511,7 @@ void PrintJobRecovery::resume() {
511 511
 
512 512
   // Restore retract and hop state from an active `G10` command
513 513
   #if ENABLED(FWRETRACT)
514
-    LOOP_L_N(e, EXTRUDERS) {
514
+    EXTRUDER_LOOP() {
515 515
       if (info.retract[e] != 0.0) {
516 516
         fwretract.current_retract[e] = info.retract[e];
517 517
         fwretract.retracted[e] = true;
@@ -634,7 +634,7 @@ void PrintJobRecovery::resume() {
634 634
 
635 635
         #if DISABLED(NO_VOLUMETRICS)
636 636
           DEBUG_ECHOPGM("filament_size:");
637
-          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPGM(" ", info.filament_size[i]);
637
+          EXTRUDER_LOOP() DEBUG_ECHOLNPGM(" ", info.filament_size[e]);
638 638
           DEBUG_EOL();
639 639
         #endif
640 640
 
@@ -666,7 +666,7 @@ void PrintJobRecovery::resume() {
666 666
 
667 667
         #if ENABLED(FWRETRACT)
668 668
           DEBUG_ECHOPGM("retract: ");
669
-          for (int8_t e = 0; e < EXTRUDERS; e++) {
669
+          EXTRUDER_LOOP() {
670 670
             DEBUG_ECHO(info.retract[e]);
671 671
             if (e < EXTRUDERS - 1) DEBUG_CHAR(',');
672 672
           }

+ 3
- 3
Marlin/src/gcode/config/M200-M205.cpp View File

@@ -93,12 +93,12 @@
93 93
     }
94 94
     #else
95 95
       SERIAL_ECHOLNPGM("  M200 S", parser.volumetric_enabled);
96
-      LOOP_L_N(i, EXTRUDERS) {
96
+      EXTRUDER_LOOP() {
97 97
         report_echo_start(forReplay);
98 98
         SERIAL_ECHOLNPGM(
99
-          "  M200 T", i, " D", LINEAR_UNIT(planner.filament_size[i])
99
+          "  M200 T", e, " D", LINEAR_UNIT(planner.filament_size[e])
100 100
           #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
101
-            , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
101
+            , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[e])
102 102
           #endif
103 103
         );
104 104
       }

+ 3
- 3
Marlin/src/gcode/control/M17_M18_M84.cpp View File

@@ -77,7 +77,7 @@ void do_enable(const axis_flags_t to_enable) {
77 77
     }
78 78
   }
79 79
   #if HAS_EXTRUDERS
80
-    LOOP_L_N(e, EXTRUDERS) {
80
+    EXTRUDER_LOOP() {
81 81
       const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
82 82
       if (TEST(shall_enable, a)) {
83 83
         stepper.ENABLE_EXTRUDER(e);
@@ -161,7 +161,7 @@ void try_to_disable(const axis_flags_t to_disable) {
161 161
       DEBUG_ECHOLNPGM(" ... still_enabled=", hex_word(still_enabled));
162 162
     }
163 163
   #if HAS_EXTRUDERS
164
-    LOOP_L_N(e, EXTRUDERS) {
164
+    EXTRUDER_LOOP() {
165 165
       const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
166 166
       if (TEST(to_disable.bits, a)) {
167 167
         DEBUG_ECHOPGM("Try to disable E", AS_DIGIT(e), " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
@@ -194,7 +194,7 @@ void try_to_disable(const axis_flags_t to_disable) {
194 194
     }
195 195
   }
196 196
   #if HAS_EXTRUDERS
197
-    LOOP_L_N(e, EXTRUDERS) {
197
+    EXTRUDER_LOOP() {
198 198
       const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
199 199
       if (TEST(still_enabled, a)) {
200 200
         SERIAL_CHAR('E', '0' + e);

+ 9
- 9
Marlin/src/gcode/feature/advance/M900.cpp View File

@@ -117,10 +117,10 @@ void GcodeSuite::M900() {
117 117
       #if EXTRUDERS < 2
118 118
         SERIAL_ECHOLNPGM("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
119 119
       #else
120
-        LOOP_L_N(i, EXTRUDERS) {
121
-          const bool slot = TEST(lin_adv_slot, i);
122
-          SERIAL_ECHOLNPGM("Advance T", i, " S", slot, " K", planner.extruder_advance_K[i],
123
-                            "(S", !slot, " K", other_extruder_advance_K[i], ")");
120
+        EXTRUDER_LOOP() {
121
+          const bool slot = TEST(lin_adv_slot, e);
122
+          SERIAL_ECHOLNPGM("Advance T", e, " S", slot, " K", planner.extruder_advance_K[e],
123
+                            "(S", !slot, " K", other_extruder_advance_K[e], ")");
124 124
           SERIAL_EOL();
125 125
         }
126 126
       #endif
@@ -132,9 +132,9 @@ void GcodeSuite::M900() {
132 132
         SERIAL_ECHOLNPGM("Advance K=", planner.extruder_advance_K[0]);
133 133
       #else
134 134
         SERIAL_ECHOPGM("Advance K");
135
-        LOOP_L_N(i, EXTRUDERS) {
136
-          SERIAL_CHAR(' ', '0' + i, ':');
137
-          SERIAL_DECIMAL(planner.extruder_advance_K[i]);
135
+        EXTRUDER_LOOP() {
136
+          SERIAL_CHAR(' ', '0' + e, ':');
137
+          SERIAL_DECIMAL(planner.extruder_advance_K[e]);
138 138
         }
139 139
         SERIAL_EOL();
140 140
       #endif
@@ -150,9 +150,9 @@ void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
150 150
     report_echo_start(forReplay);
151 151
     SERIAL_ECHOLNPGM("  M900 K", planner.extruder_advance_K[0]);
152 152
   #else
153
-    LOOP_L_N(i, EXTRUDERS) {
153
+    EXTRUDER_LOOP() {
154 154
       report_echo_start(forReplay);
155
-      SERIAL_ECHOLNPGM("  M900 T", i, " K", planner.extruder_advance_K[i]);
155
+      SERIAL_ECHOLNPGM("  M900 T", e, " K", planner.extruder_advance_K[e]);
156 156
     }
157 157
   #endif
158 158
 }

+ 1
- 1
Marlin/src/gcode/feature/pause/M603.cpp View File

@@ -72,7 +72,7 @@ void GcodeSuite::M603_report(const bool forReplay/*=true*/) {
72 72
     SERIAL_ECHOPGM("  M603 L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length), " ;");
73 73
     say_units();
74 74
   #else
75
-    LOOP_L_N(e, EXTRUDERS) {
75
+    EXTRUDER_LOOP() {
76 76
       report_echo_start(forReplay);
77 77
       SERIAL_ECHOPGM("  M603 T", e, " L", LINEAR_UNIT(fc_settings[e].load_length), " U", LINEAR_UNIT(fc_settings[e].unload_length), " ;");
78 78
       say_units();

+ 1
- 0
Marlin/src/inc/Conditionals_LCD.h View File

@@ -749,6 +749,7 @@
749 749
 #endif
750 750
 
751 751
 // Helper macros for extruder and hotend arrays
752
+#define EXTRUDER_LOOP() for (int8_t e = 0; e < EXTRUDERS; e++)
752 753
 #define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
753 754
 #define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
754 755
 #define ARRAY_BY_EXTRUDERS1(v1) ARRAY_N_1(EXTRUDERS, v1)

+ 10
- 10
Marlin/src/lcd/menu/menu_advanced.cpp View File

@@ -109,8 +109,8 @@ void menu_backlash();
109 109
       #if EXTRUDERS == 1
110 110
         EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
111 111
       #elif HAS_MULTI_EXTRUDER
112
-        LOOP_L_N(n, EXTRUDERS)
113
-          EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 10);
112
+        EXTRUDER_LOOP()
113
+          EDIT_ITEM_N(float42_52, e, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
114 114
       #endif
115 115
     #endif
116 116
 
@@ -120,16 +120,16 @@ void menu_backlash();
120 120
       #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
121 121
         EDIT_ITEM_FAST(float42_52, MSG_VOLUMETRIC_LIMIT, &planner.volumetric_extruder_limit[active_extruder], 0.0f, 20.0f, planner.calculate_volumetric_extruder_limits);
122 122
         #if HAS_MULTI_EXTRUDER
123
-          LOOP_L_N(n, EXTRUDERS)
124
-            EDIT_ITEM_FAST_N(float42_52, n, MSG_VOLUMETRIC_LIMIT_E, &planner.volumetric_extruder_limit[n], 0.0f, 20.00f, planner.calculate_volumetric_extruder_limits);
123
+          EXTRUDER_LOOP()
124
+            EDIT_ITEM_FAST_N(float42_52, e, MSG_VOLUMETRIC_LIMIT_E, &planner.volumetric_extruder_limit[e], 0.0f, 20.00f, planner.calculate_volumetric_extruder_limits);
125 125
         #endif
126 126
       #endif
127 127
 
128 128
       if (parser.volumetric_enabled) {
129 129
         EDIT_ITEM_FAST(float43, MSG_FILAMENT_DIAM, &planner.filament_size[active_extruder], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
130 130
         #if HAS_MULTI_EXTRUDER
131
-          LOOP_L_N(n, EXTRUDERS)
132
-            EDIT_ITEM_FAST_N(float43, n, MSG_FILAMENT_DIAM_E, &planner.filament_size[n], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
131
+          EXTRUDER_LOOP()
132
+            EDIT_ITEM_FAST_N(float43, e, MSG_FILAMENT_DIAM_E, &planner.filament_size[e], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
133 133
         #endif
134 134
       }
135 135
     #endif
@@ -139,14 +139,14 @@ void menu_backlash();
139 139
 
140 140
       EDIT_ITEM_FAST(float4, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
141 141
       #if HAS_MULTI_EXTRUDER
142
-        LOOP_L_N(n, EXTRUDERS)
143
-          EDIT_ITEM_FAST_N(float4, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
142
+        EXTRUDER_LOOP()
143
+          EDIT_ITEM_FAST_N(float4, e, MSG_FILAMENTUNLOAD_E, &fc_settings[e].unload_length, 0, extrude_maxlength);
144 144
       #endif
145 145
 
146 146
       EDIT_ITEM_FAST(float4, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
147 147
       #if HAS_MULTI_EXTRUDER
148
-        LOOP_L_N(n, EXTRUDERS)
149
-          EDIT_ITEM_FAST_N(float4, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
148
+        EXTRUDER_LOOP()
149
+          EDIT_ITEM_FAST_N(float4, e, MSG_FILAMENTLOAD_E, &fc_settings[e].load_length, 0, extrude_maxlength);
150 150
       #endif
151 151
     #endif
152 152
 

+ 3
- 3
Marlin/src/lcd/menu/menu_configuration.cpp View File

@@ -145,9 +145,9 @@ void menu_advanced_settings();
145 145
       EDIT_ITEM(uint8, MSG_TOOL_MIGRATION_END, &migration.last, 0, EXTRUDERS - 1);
146 146
 
147 147
       // Migrate to a chosen extruder
148
-      LOOP_L_N(s, EXTRUDERS) {
149
-        if (s != active_extruder) {
150
-          ACTION_ITEM_N_P(s, msg_migrate, []{
148
+      EXTRUDER_LOOP() {
149
+        if (e != active_extruder) {
150
+          ACTION_ITEM_N_P(e, msg_migrate, []{
151 151
             char cmd[12];
152 152
             sprintf_P(cmd, PSTR("M217 T%i"), int(MenuItemBase::itemIndex));
153 153
             queue.inject(cmd);

+ 5
- 5
Marlin/src/lcd/menu/menu_mmu2.cpp View File

@@ -48,7 +48,7 @@ void _mmu2_load_filament(uint8_t index) {
48 48
   ui.reset_status();
49 49
 }
50 50
 void action_mmu2_load_all() {
51
-  LOOP_L_N(i, EXTRUDERS) _mmu2_load_filament(i);
51
+  EXTRUDER_LOOP() _mmu2_load_filament(e);
52 52
   ui.return_to_status();
53 53
 }
54 54
 
@@ -56,14 +56,14 @@ void menu_mmu2_load_filament() {
56 56
   START_MENU();
57 57
   BACK_ITEM(MSG_MMU2_MENU);
58 58
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
59
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(MenuItemBase::itemIndex); });
59
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(MenuItemBase::itemIndex); });
60 60
   END_MENU();
61 61
 }
62 62
 
63 63
 void menu_mmu2_load_to_nozzle() {
64 64
   START_MENU();
65 65
   BACK_ITEM(MSG_MMU2_MENU);
66
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(MenuItemBase::itemIndex); });
66
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(MenuItemBase::itemIndex); });
67 67
   END_MENU();
68 68
 }
69 69
 
@@ -89,7 +89,7 @@ void action_mmu2_unload_filament() {
89 89
 void menu_mmu2_eject_filament() {
90 90
   START_MENU();
91 91
   BACK_ITEM(MSG_MMU2_MENU);
92
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(MenuItemBase::itemIndex); });
92
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(MenuItemBase::itemIndex); });
93 93
   END_MENU();
94 94
 }
95 95
 
@@ -130,7 +130,7 @@ void menu_mmu2_choose_filament() {
130 130
   #if LCD_HEIGHT > 2
131 131
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_DEFAULT|SS_INVERT);
132 132
   #endif
133
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_chosen(MenuItemBase::itemIndex); });
133
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ action_mmu2_chosen(MenuItemBase::itemIndex); });
134 134
   END_MENU();
135 135
 }
136 136
 

+ 4
- 4
Marlin/src/lcd/menu/menu_tune.cpp View File

@@ -199,8 +199,8 @@ void menu_tune() {
199 199
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
200 200
     // Flow En:
201 201
     #if HAS_MULTI_EXTRUDER
202
-      LOOP_L_N(n, EXTRUDERS)
203
-        EDIT_ITEM_N(int3, n, MSG_FLOW_N, &planner.flow_percentage[n], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
202
+      EXTRUDER_LOOP()
203
+        EDIT_ITEM_N(int3, e, MSG_FLOW_N, &planner.flow_percentage[e], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
204 204
     #endif
205 205
   #endif
206 206
 
@@ -211,8 +211,8 @@ void menu_tune() {
211 211
     #if EXTRUDERS == 1
212 212
       EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
213 213
     #elif HAS_MULTI_EXTRUDER
214
-      LOOP_L_N(n, EXTRUDERS)
215
-        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 10);
214
+      EXTRUDER_LOOP()
215
+        EDIT_ITEM_N(float42_52, e, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
216 216
     #endif
217 217
   #endif
218 218
 

+ 1
- 1
Marlin/src/module/planner.cpp View File

@@ -1505,7 +1505,7 @@ void Planner::check_axes_activity() {
1505 1505
     volumetric_extruder_feedrate_limit[e] = (lim && siz) ? lim / CIRCLE_AREA(siz * 0.5f) : 0;
1506 1506
   }
1507 1507
   void Planner::calculate_volumetric_extruder_limits() {
1508
-    LOOP_L_N(e, EXTRUDERS) calculate_volumetric_extruder_limit(e);
1508
+    EXTRUDER_LOOP() calculate_volumetric_extruder_limit(e);
1509 1509
   }
1510 1510
 
1511 1511
 #endif

+ 2
- 2
Marlin/src/module/planner.h View File

@@ -928,8 +928,8 @@ class Planner {
928 928
     #if HAS_LINEAR_E_JERK
929 929
       FORCE_INLINE static void recalculate_max_e_jerk() {
930 930
         const float prop = junction_deviation_mm * SQRT(0.5) / (1.0f - SQRT(0.5));
931
-        LOOP_L_N(i, EXTRUDERS)
932
-          max_e_jerk[E_INDEX_N(i)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_INDEX_N(i)]);
931
+        EXTRUDER_LOOP()
932
+          max_e_jerk[E_INDEX_N(e)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_INDEX_N(e)]);
933 933
       }
934 934
     #endif
935 935
 

+ 4
- 4
Marlin/src/module/settings.cpp View File

@@ -3138,9 +3138,9 @@ void MarlinSettings::reset() {
3138 3138
   //
3139 3139
 
3140 3140
   #if ENABLED(LIN_ADVANCE)
3141
-    LOOP_L_N(i, EXTRUDERS) {
3142
-      planner.extruder_advance_K[i] = LIN_ADVANCE_K;
3143
-      TERN_(EXTRA_LIN_ADVANCE_K, other_extruder_advance_K[i] = LIN_ADVANCE_K);
3141
+    EXTRUDER_LOOP() {
3142
+      planner.extruder_advance_K[e] = LIN_ADVANCE_K;
3143
+      TERN_(EXTRA_LIN_ADVANCE_K, other_extruder_advance_K[e] = LIN_ADVANCE_K);
3144 3144
     }
3145 3145
   #endif
3146 3146
 
@@ -3185,7 +3185,7 @@ void MarlinSettings::reset() {
3185 3185
   // Advanced Pause filament load & unload lengths
3186 3186
   //
3187 3187
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
3188
-    LOOP_L_N(e, EXTRUDERS) {
3188
+    EXTRUDER_LOOP() {
3189 3189
       fc_settings[e].unload_length = FILAMENT_CHANGE_UNLOAD_LENGTH;
3190 3190
       fc_settings[e].load_length = FILAMENT_CHANGE_FAST_LOAD_LENGTH;
3191 3191
     }

Loading…
Cancel
Save