Browse Source

Shared singlenozzle item

Scott Lahteine 3 years ago
parent
commit
2fb22cc116

+ 10
- 0
Marlin/src/lcd/menu/menu_item.h View File

@@ -479,4 +479,14 @@ class MenuItem_bool : public MenuEditItemBase {
479 479
 
480 480
   #define SNFAN(N) (ENABLED(SINGLENOZZLE_STANDBY_FAN) && !HAS_FAN##N && EXTRUDERS > N)
481 481
 
482
+  #if SNFAN(1) || SNFAN(2) || SNFAN(3) || SNFAN(4) || SNFAN(5) || SNFAN(6) || SNFAN(7)
483
+    #define DEFINE_SINGLENOZZLE_ITEM() \
484
+      auto singlenozzle_item = [&](const uint8_t f) { \
485
+        editable.uint8 = singlenozzle_fan_speed[f]; \
486
+        EDIT_ITEM_FAST_N(percent, f, MSG_STORED_FAN_N, &editable.uint8, 0, 255, on_fan_update); \
487
+      }
488
+  #else
489
+    #define DEFINE_SINGLENOZZLE_ITEM() NOOP
490
+  #endif
491
+
482 492
 #endif // HAS_FAN

+ 1
- 6
Marlin/src/lcd/menu/menu_temperature.cpp View File

@@ -191,12 +191,7 @@ void menu_temperature() {
191 191
   //
192 192
   #if HAS_FAN
193 193
 
194
-    #if SNFAN(1) || SNFAN(2) || SNFAN(3) || SNFAN(4) || SNFAN(5) || SNFAN(6) || SNFAN(7)
195
-      auto singlenozzle_item = [&](const uint8_t f) {
196
-        editable.uint8 = singlenozzle_fan_speed[f];
197
-        EDIT_ITEM_FAST_N(percent, f, MSG_STORED_FAN_N, &editable.uint8, 0, 255, on_fan_update);
198
-      };
199
-    #endif
194
+    DEFINE_SINGLENOZZLE_ITEM();
200 195
 
201 196
     #if HAS_FAN0
202 197
       _FAN_EDIT_ITEMS(0,FIRST_FAN_SPEED);

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

@@ -142,12 +142,7 @@ void menu_tune() {
142 142
   //
143 143
   #if HAS_FAN
144 144
 
145
-    #if SNFAN(1) || SNFAN(2) || SNFAN(3) || SNFAN(4) || SNFAN(5) || SNFAN(6) || SNFAN(7)
146
-      auto singlenozzle_item = [&](const uint8_t f) {
147
-        editable.uint8 = singlenozzle_fan_speed[f];
148
-        EDIT_ITEM_FAST_N(percent, f, MSG_STORED_FAN_N, &editable.uint8, 0, 255, on_fan_update);
149
-      };
150
-    #endif
145
+    DEFINE_SINGLENOZZLE_ITEM();
151 146
 
152 147
     #if HAS_FAN0
153 148
       _FAN_EDIT_ITEMS(0,FIRST_FAN_SPEED);

Loading…
Cancel
Save