Scott Lahteine 5 лет назад
Родитель
Сommit
aaf018e5a0

+ 6
- 4
Marlin/src/core/language.h Просмотреть файл

258
 #define MSG_KILL_BUTTON                     "KILL caused by KILL button/pin"
258
 #define MSG_KILL_BUTTON                     "KILL caused by KILL button/pin"
259
 
259
 
260
 // temperature.cpp strings
260
 // temperature.cpp strings
261
-#define MSG_PID_AUTOTUNE                    "PID Autotune"
262
-#define MSG_PID_AUTOTUNE_START              MSG_PID_AUTOTUNE " start"
263
-#define MSG_PID_AUTOTUNE_FAILED             MSG_PID_AUTOTUNE " failed!"
261
+#define MSG_PID_AUTOTUNE_PREFIX             "PID Autotune"
262
+#define MSG_PID_AUTOTUNE_START              MSG_PID_AUTOTUNE_PREFIX " start"
263
+#define MSG_PID_AUTOTUNE_FAILED             MSG_PID_AUTOTUNE_PREFIX " failed!"
264
 #define MSG_PID_BAD_EXTRUDER_NUM            MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
264
 #define MSG_PID_BAD_EXTRUDER_NUM            MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
265
 #define MSG_PID_TEMP_TOO_HIGH               MSG_PID_AUTOTUNE_FAILED " Temperature too high"
265
 #define MSG_PID_TEMP_TOO_HIGH               MSG_PID_AUTOTUNE_FAILED " Temperature too high"
266
 #define MSG_PID_TIMEOUT                     MSG_PID_AUTOTUNE_FAILED " timeout"
266
 #define MSG_PID_TIMEOUT                     MSG_PID_AUTOTUNE_FAILED " timeout"
275
 #define MSG_KI                              " Ki: "
275
 #define MSG_KI                              " Ki: "
276
 #define MSG_KD                              " Kd: "
276
 #define MSG_KD                              " Kd: "
277
 #define MSG_AT                              " @:"
277
 #define MSG_AT                              " @:"
278
-#define MSG_PID_AUTOTUNE_FINISHED           MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
278
+#define MSG_PID_AUTOTUNE_FINISHED           MSG_PID_AUTOTUNE_PREFIX " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
279
 #define MSG_PID_DEBUG                       " PID_DEBUG "
279
 #define MSG_PID_DEBUG                       " PID_DEBUG "
280
 #define MSG_PID_DEBUG_INPUT                 ": Input "
280
 #define MSG_PID_DEBUG_INPUT                 ": Input "
281
 #define MSG_PID_DEBUG_OUTPUT                " Output "
281
 #define MSG_PID_DEBUG_OUTPUT                " Output "
349
  *
349
  *
350
  */
350
  */
351
 #if ENABLED(NUMBER_TOOLS_FROM_0)
351
 #if ENABLED(NUMBER_TOOLS_FROM_0)
352
+  #define LCD_FIRST_TOOL '0'
352
   #define LCD_STR_N0 "0"
353
   #define LCD_STR_N0 "0"
353
   #define LCD_STR_N1 "1"
354
   #define LCD_STR_N1 "1"
354
   #define LCD_STR_N2 "2"
355
   #define LCD_STR_N2 "2"
356
   #define LCD_STR_N4 "4"
357
   #define LCD_STR_N4 "4"
357
   #define LCD_STR_N5 "5"
358
   #define LCD_STR_N5 "5"
358
 #else
359
 #else
360
+  #define LCD_FIRST_TOOL '1'
359
   #define LCD_STR_N0 "1"
361
   #define LCD_STR_N0 "1"
360
   #define LCD_STR_N1 "2"
362
   #define LCD_STR_N1 "2"
361
   #define LCD_STR_N2 "3"
363
   #define LCD_STR_N2 "3"

+ 8
- 0
Marlin/src/lcd/language/language_en.h Просмотреть файл

709
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
709
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
710
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
710
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
711
 }
711
 }
712
+
713
+#if FAN_COUNT == 1
714
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
715
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
716
+#else
717
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_1
718
+  #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_1
719
+#endif

+ 2
- 2
Marlin/src/lcd/menu/menu_temperature.cpp Просмотреть файл

237
   #if FAN_COUNT > 0
237
   #if FAN_COUNT > 0
238
     #if HAS_FAN0
238
     #if HAS_FAN0
239
       editable.uint8 = thermalManager.fan_speed[0];
239
       editable.uint8 = thermalManager.fan_speed[0];
240
-      EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_1, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
240
+      EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
241
       #if ENABLED(EXTRA_FAN_SPEED)
241
       #if ENABLED(EXTRA_FAN_SPEED)
242
-        EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_1, &thermalManager.new_fan_speed[0], 3, 255);
242
+        EDIT_ITEM_FAST(percent, MSG_FIRST_EXTRA_FAN_SPEED, &thermalManager.new_fan_speed[0], 3, 255);
243
       #endif
243
       #endif
244
     #endif
244
     #endif
245
     #if HAS_FAN1
245
     #if HAS_FAN1

+ 0
- 7
Marlin/src/lcd/menu/menu_tune.cpp Просмотреть файл

161
   //
161
   //
162
   #if FAN_COUNT > 0
162
   #if FAN_COUNT > 0
163
     #if HAS_FAN0
163
     #if HAS_FAN0
164
-      #if FAN_COUNT == 1
165
-        #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
166
-        #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
167
-      #else
168
-        #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_1
169
-        #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_1
170
-      #endif
171
       editable.uint8 = thermalManager.fan_speed[0];
164
       editable.uint8 = thermalManager.fan_speed[0];
172
       EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
165
       EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
173
       #if ENABLED(EXTRA_FAN_SPEED)
166
       #if ENABLED(EXTRA_FAN_SPEED)

Загрузка…
Отмена
Сохранить