Browse Source

Fan menus fix. FR cosmetic change. (#15714)

studiodyne 5 years ago
parent
commit
319e2b5760

+ 9
- 9
Marlin/src/lcd/language/language_fr.h View File

113
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Allumer alim.");
113
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Allumer alim.");
114
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Eteindre alim.");
114
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Eteindre alim.");
115
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrusion");
115
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrusion");
116
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retrait");
116
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Rétractation");
117
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Déplacer un axe");
117
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Déplacer un axe");
118
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Régler Niv. lit");
118
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Régler Niv. lit");
119
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveau du lit");
119
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveau du lit");
264
   PROGMEM Language_Str MSG_NOZZLE_5                        = _UxGT("Buse ") LCD_STR_N5;
264
   PROGMEM Language_Str MSG_NOZZLE_5                        = _UxGT("Buse ") LCD_STR_N5;
265
   PROGMEM Language_Str MSG_BED                             = _UxGT("Lit");
265
   PROGMEM Language_Str MSG_BED                             = _UxGT("Lit");
266
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Caisson");
266
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Caisson");
267
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vitesse ventil.");
268
-  PROGMEM Language_Str MSG_FAN_SPEED_1                     = _UxGT("Vitesse ventil. 1");
269
-  PROGMEM Language_Str MSG_FAN_SPEED_2                     = _UxGT("Vitesse ventil. 2");
270
-  PROGMEM Language_Str MSG_FAN_SPEED_3                     = _UxGT("Vitesse ventil. 3");
271
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra V ventil.");
272
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_1               = _UxGT("Extra V ventil. 1");
273
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_2               = _UxGT("Extra V ventil. 2");
274
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_3               = _UxGT("Extra V ventil. 3");
267
+  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vit.  ventil.  ");
268
+  PROGMEM Language_Str MSG_FAN_SPEED_1                     = _UxGT("Vit.  ventil. 1");
269
+  PROGMEM Language_Str MSG_FAN_SPEED_2                     = _UxGT("Vit.  ventil. 2");
270
+  PROGMEM Language_Str MSG_FAN_SPEED_3                     = _UxGT("Vit.  ventil. 3");
271
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra ventil.  ");
272
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_1               = _UxGT("Extra ventil. 1");
273
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_2               = _UxGT("Extra ventil. 2");
274
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_3               = _UxGT("Extra ventil. 3");
275
 
275
 
276
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flux");
276
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flux");
277
   PROGMEM Language_Str MSG_FLOW_0                          = _UxGT("Flux ") LCD_STR_N0;
277
   PROGMEM Language_Str MSG_FLOW_0                          = _UxGT("Flux ") LCD_STR_N0;

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

242
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_1, &thermalManager.new_fan_speed[0], 3, 255);
242
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_1, &thermalManager.new_fan_speed[0], 3, 255);
243
       #endif
243
       #endif
244
     #endif
244
     #endif
245
-    #if HAS_FAN1 || (ENABLED(SINGLENOZZLE) && EXTRUDERS > 1)
245
+    #if HAS_FAN1
246
       editable.uint8 = thermalManager.fan_speed[1];
246
       editable.uint8 = thermalManager.fan_speed[1];
247
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(1, editable.uint8); });
247
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(1, editable.uint8); });
248
       #if ENABLED(EXTRA_FAN_SPEED)
248
       #if ENABLED(EXTRA_FAN_SPEED)
249
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_2, &thermalManager.new_fan_speed[1], 3, 255);
249
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_2, &thermalManager.new_fan_speed[1], 3, 255);
250
       #endif
250
       #endif
251
     #endif
251
     #endif
252
-    #if HAS_FAN2 || (ENABLED(SINGLENOZZLE) && EXTRUDERS > 2)
252
+    #if HAS_FAN2
253
       editable.uint8 = thermalManager.fan_speed[2];
253
       editable.uint8 = thermalManager.fan_speed[2];
254
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(2, editable.uint8); });
254
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(2, editable.uint8); });
255
       #if ENABLED(EXTRA_FAN_SPEED)
255
       #if ENABLED(EXTRA_FAN_SPEED)

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

174
         EDIT_ITEM_FAST(percent, MSG_FIRST_EXTRA_FAN_SPEED, &thermalManager.new_fan_speed[0], 3, 255);
174
         EDIT_ITEM_FAST(percent, MSG_FIRST_EXTRA_FAN_SPEED, &thermalManager.new_fan_speed[0], 3, 255);
175
       #endif
175
       #endif
176
     #endif
176
     #endif
177
-    #if HAS_FAN1 || (ENABLED(SINGLENOZZLE) && EXTRUDERS > 1)
177
+    #if HAS_FAN1
178
       editable.uint8 = thermalManager.fan_speed[1];
178
       editable.uint8 = thermalManager.fan_speed[1];
179
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(1, editable.uint8); });
179
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_2, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(1, editable.uint8); });
180
       #if ENABLED(EXTRA_FAN_SPEED)
180
       #if ENABLED(EXTRA_FAN_SPEED)
181
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_2, &thermalManager.new_fan_speed[1], 3, 255);
181
         EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_2, &thermalManager.new_fan_speed[1], 3, 255);
182
       #endif
182
       #endif
183
     #endif
183
     #endif
184
-    #if HAS_FAN2 || (ENABLED(SINGLENOZZLE) && EXTRUDERS > 2)
184
+    #if HAS_FAN2
185
       editable.uint8 = thermalManager.fan_speed[2];
185
       editable.uint8 = thermalManager.fan_speed[2];
186
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(2, editable.uint8); });
186
       EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_3, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(2, editable.uint8); });
187
       #if ENABLED(EXTRA_FAN_SPEED)
187
       #if ENABLED(EXTRA_FAN_SPEED)

Loading…
Cancel
Save