Browse Source

Better singlenozzle stored fan speed menus (#15921)

InsanityAutomation 5 years ago
parent
commit
e81b946f06

+ 1
- 0
Marlin/src/lcd/language/language_en.h View File

249
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Enclosure");
249
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Enclosure");
250
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fan Speed");
250
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fan Speed");
251
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fan Speed =");
251
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fan Speed =");
252
+  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan =");
252
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra Fan Speed");
253
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra Fan Speed");
253
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra Fan Speed =");
254
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra Fan Speed =");
254
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flow");
255
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flow");

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

211
       #if ENABLED(EXTRA_FAN_SPEED)
211
       #if ENABLED(EXTRA_FAN_SPEED)
212
         EDIT_ITEM_FAST_N(percent, 2, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[1], 3, 255);
212
         EDIT_ITEM_FAST_N(percent, 2, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[1], 3, 255);
213
       #endif
213
       #endif
214
+    #elif ENABLED(SINGLENOZZLE) && EXTRUDERS > 1
215
+      editable.uint8 = thermalManager.fan_speed[1];
216
+      EDIT_ITEM_FAST_N(percent, 2, MSG_STORED_FAN_N, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(1, editable.uint8); });
214
     #endif
217
     #endif
215
     #if HAS_FAN2
218
     #if HAS_FAN2
216
       editable.uint8 = thermalManager.fan_speed[2];
219
       editable.uint8 = thermalManager.fan_speed[2];
218
       #if ENABLED(EXTRA_FAN_SPEED)
221
       #if ENABLED(EXTRA_FAN_SPEED)
219
         EDIT_ITEM_FAST_N(percent, 3, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[2], 3, 255);
222
         EDIT_ITEM_FAST_N(percent, 3, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[2], 3, 255);
220
       #endif
223
       #endif
224
+    #elif ENABLED(SINGLENOZZLE) && EXTRUDERS > 2
225
+      editable.uint8 = thermalManager.fan_speed[2];
226
+      EDIT_ITEM_FAST_N(percent, 3, MSG_STORED_FAN_N, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(2, editable.uint8); });
221
     #endif
227
     #endif
222
   #endif // FAN_COUNT > 0
228
   #endif // FAN_COUNT > 0
223
 
229
 

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

160
       #if ENABLED(EXTRA_FAN_SPEED)
160
       #if ENABLED(EXTRA_FAN_SPEED)
161
         EDIT_ITEM_FAST_N(percent, 2, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[1], 3, 255);
161
         EDIT_ITEM_FAST_N(percent, 2, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[1], 3, 255);
162
       #endif
162
       #endif
163
+    #elif ENABLED(SINGLENOZZLE) && EXTRUDERS > 1
164
+      editable.uint8 = thermalManager.fan_speed[1];
165
+      EDIT_ITEM_FAST_N(percent, 2, MSG_STORED_FAN_N, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(1, editable.uint8); });
163
     #endif
166
     #endif
164
     #if HAS_FAN2
167
     #if HAS_FAN2
165
       editable.uint8 = thermalManager.fan_speed[2];
168
       editable.uint8 = thermalManager.fan_speed[2];
167
       #if ENABLED(EXTRA_FAN_SPEED)
170
       #if ENABLED(EXTRA_FAN_SPEED)
168
         EDIT_ITEM_FAST_N(percent, 3, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[2], 3, 255);
171
         EDIT_ITEM_FAST_N(percent, 3, MSG_EXTRA_FAN_SPEED_N, &thermalManager.new_fan_speed[2], 3, 255);
169
       #endif
172
       #endif
173
+    #elif ENABLED(SINGLENOZZLE) && EXTRUDERS > 2
174
+      editable.uint8 = thermalManager.fan_speed[2];
175
+      EDIT_ITEM_FAST_N(percent, 3, MSG_STORED_FAN_N, &editable.uint8, 0, 255, []{ thermalManager.set_fan_speed(2, editable.uint8); });
170
     #endif
176
     #endif
171
   #endif // FAN_COUNT > 0
177
   #endif // FAN_COUNT > 0
172
 
178
 

Loading…
Cancel
Save