Language changes
This commit is contained in:
parent
583fc4ee2a
commit
aaf018e5a0
|
@ -258,9 +258,9 @@
|
||||||
#define MSG_KILL_BUTTON "KILL caused by KILL button/pin"
|
#define MSG_KILL_BUTTON "KILL caused by KILL button/pin"
|
||||||
|
|
||||||
// temperature.cpp strings
|
// temperature.cpp strings
|
||||||
#define MSG_PID_AUTOTUNE "PID Autotune"
|
#define MSG_PID_AUTOTUNE_PREFIX "PID Autotune"
|
||||||
#define MSG_PID_AUTOTUNE_START MSG_PID_AUTOTUNE " start"
|
#define MSG_PID_AUTOTUNE_START MSG_PID_AUTOTUNE_PREFIX " start"
|
||||||
#define MSG_PID_AUTOTUNE_FAILED MSG_PID_AUTOTUNE " failed!"
|
#define MSG_PID_AUTOTUNE_FAILED MSG_PID_AUTOTUNE_PREFIX " failed!"
|
||||||
#define MSG_PID_BAD_EXTRUDER_NUM MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
|
#define MSG_PID_BAD_EXTRUDER_NUM MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
|
||||||
#define MSG_PID_TEMP_TOO_HIGH MSG_PID_AUTOTUNE_FAILED " Temperature too high"
|
#define MSG_PID_TEMP_TOO_HIGH MSG_PID_AUTOTUNE_FAILED " Temperature too high"
|
||||||
#define MSG_PID_TIMEOUT MSG_PID_AUTOTUNE_FAILED " timeout"
|
#define MSG_PID_TIMEOUT MSG_PID_AUTOTUNE_FAILED " timeout"
|
||||||
|
@ -275,7 +275,7 @@
|
||||||
#define MSG_KI " Ki: "
|
#define MSG_KI " Ki: "
|
||||||
#define MSG_KD " Kd: "
|
#define MSG_KD " Kd: "
|
||||||
#define MSG_AT " @:"
|
#define MSG_AT " @:"
|
||||||
#define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
|
#define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE_PREFIX " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
|
||||||
#define MSG_PID_DEBUG " PID_DEBUG "
|
#define MSG_PID_DEBUG " PID_DEBUG "
|
||||||
#define MSG_PID_DEBUG_INPUT ": Input "
|
#define MSG_PID_DEBUG_INPUT ": Input "
|
||||||
#define MSG_PID_DEBUG_OUTPUT " Output "
|
#define MSG_PID_DEBUG_OUTPUT " Output "
|
||||||
|
@ -349,6 +349,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#if ENABLED(NUMBER_TOOLS_FROM_0)
|
#if ENABLED(NUMBER_TOOLS_FROM_0)
|
||||||
|
#define LCD_FIRST_TOOL '0'
|
||||||
#define LCD_STR_N0 "0"
|
#define LCD_STR_N0 "0"
|
||||||
#define LCD_STR_N1 "1"
|
#define LCD_STR_N1 "1"
|
||||||
#define LCD_STR_N2 "2"
|
#define LCD_STR_N2 "2"
|
||||||
|
@ -356,6 +357,7 @@
|
||||||
#define LCD_STR_N4 "4"
|
#define LCD_STR_N4 "4"
|
||||||
#define LCD_STR_N5 "5"
|
#define LCD_STR_N5 "5"
|
||||||
#else
|
#else
|
||||||
|
#define LCD_FIRST_TOOL '1'
|
||||||
#define LCD_STR_N0 "1"
|
#define LCD_STR_N0 "1"
|
||||||
#define LCD_STR_N1 "2"
|
#define LCD_STR_N1 "2"
|
||||||
#define LCD_STR_N2 "3"
|
#define LCD_STR_N2 "3"
|
||||||
|
|
|
@ -709,3 +709,11 @@ namespace Language_en {
|
||||||
PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction");
|
PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction");
|
||||||
PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Smoothing");
|
PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Smoothing");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if FAN_COUNT == 1
|
||||||
|
#define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
|
||||||
|
#define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
|
||||||
|
#else
|
||||||
|
#define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_1
|
||||||
|
#define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_1
|
||||||
|
#endif
|
||||||
|
|
|
@ -237,9 +237,9 @@ void menu_temperature() {
|
||||||
#if FAN_COUNT > 0
|
#if FAN_COUNT > 0
|
||||||
#if HAS_FAN0
|
#if HAS_FAN0
|
||||||
editable.uint8 = thermalManager.fan_speed[0];
|
editable.uint8 = thermalManager.fan_speed[0];
|
||||||
EDIT_ITEM_FAST(percent, MSG_FAN_SPEED_1, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
|
EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
|
||||||
#if ENABLED(EXTRA_FAN_SPEED)
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
EDIT_ITEM_FAST(percent, MSG_EXTRA_FAN_SPEED_1, &thermalManager.new_fan_speed[0], 3, 255);
|
EDIT_ITEM_FAST(percent, MSG_FIRST_EXTRA_FAN_SPEED, &thermalManager.new_fan_speed[0], 3, 255);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN1
|
#if HAS_FAN1
|
||||||
|
|
|
@ -161,13 +161,6 @@ void menu_tune() {
|
||||||
//
|
//
|
||||||
#if FAN_COUNT > 0
|
#if FAN_COUNT > 0
|
||||||
#if HAS_FAN0
|
#if HAS_FAN0
|
||||||
#if FAN_COUNT == 1
|
|
||||||
#define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
|
|
||||||
#define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED
|
|
||||||
#else
|
|
||||||
#define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_1
|
|
||||||
#define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_1
|
|
||||||
#endif
|
|
||||||
editable.uint8 = thermalManager.fan_speed[0];
|
editable.uint8 = thermalManager.fan_speed[0];
|
||||||
EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
|
EDIT_ITEM_FAST(percent, MSG_FIRST_FAN_SPEED, &editable.uint8, 0, 255, [](){ thermalManager.set_fan_speed(0, editable.uint8); });
|
||||||
#if ENABLED(EXTRA_FAN_SPEED)
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
|
|
Loading…
Reference in a new issue