From b0c6cfb0511b8d71fec26ab91cd945f3d623b3c0 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Thu, 9 Jul 2020 10:11:57 +0200
Subject: [PATCH] MarlinUI support for up to 5 Material Presets (#18488)
- Add `I` preset parameter to `G26`, `M106`, `M140`, and `M190`.
- Extend menu items to permit a string interpolation.
- Keep material names in a list and interpolate in menu items.
- Extend material presets to support up to 5 predefined materials.
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
Marlin/src/gcode/bedlevel/G26.cpp | 57 +++++-
Marlin/src/gcode/temp/M104_M109.cpp | 76 ++++++--
Marlin/src/gcode/temp/M106_M107.cpp | 32 +++-
Marlin/src/gcode/temp/M140_M190.cpp | 70 ++++++-
Marlin/src/inc/Conditionals_LCD.h | 8 -
Marlin/src/inc/Conditionals_post.h | 14 +-
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp | 14 +-
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp | 16 +-
Marlin/src/lcd/dogm/ultralcd_DOGM.h | 36 ----
Marlin/src/lcd/language/language_an.h | 31 +--
Marlin/src/lcd/language/language_bg.h | 31 +--
Marlin/src/lcd/language/language_ca.h | 31 +--
Marlin/src/lcd/language/language_cz.h | 39 ++--
Marlin/src/lcd/language/language_da.h | 31 +--
Marlin/src/lcd/language/language_de.h | 39 ++--
Marlin/src/lcd/language/language_el.h | 31 +--
Marlin/src/lcd/language/language_el_gr.h | 31 +--
Marlin/src/lcd/language/language_en.h | 37 ++--
Marlin/src/lcd/language/language_es.h | 39 ++--
Marlin/src/lcd/language/language_eu.h | 39 ++--
Marlin/src/lcd/language/language_fi.h | 31 +--
Marlin/src/lcd/language/language_fr.h | 39 ++--
Marlin/src/lcd/language/language_gl.h | 39 ++--
Marlin/src/lcd/language/language_hr.h | 31 +--
Marlin/src/lcd/language/language_hu.h | 39 ++--
Marlin/src/lcd/language/language_it.h | 39 ++--
Marlin/src/lcd/language/language_jp_kana.h | 31 +--
Marlin/src/lcd/language/language_ko_KR.h | 19 +-
Marlin/src/lcd/language/language_nl.h | 31 +--
Marlin/src/lcd/language/language_pl.h | 39 ++--
Marlin/src/lcd/language/language_pt.h | 31 +--
Marlin/src/lcd/language/language_pt_br.h | 39 ++--
Marlin/src/lcd/language/language_ro.h | 39 ++--
Marlin/src/lcd/language/language_ru.h | 46 +++--
Marlin/src/lcd/language/language_sk.h | 39 ++--
Marlin/src/lcd/language/language_tr.h | 39 ++--
Marlin/src/lcd/language/language_uk.h | 39 ++--
Marlin/src/lcd/language/language_vi.h | 39 ++--
Marlin/src/lcd/language/language_zh_CN.h | 39 ++--
Marlin/src/lcd/language/language_zh_TW.h | 39 ++--
Marlin/src/lcd/lcdprint.cpp | 19 +-
Marlin/src/lcd/lcdprint.h | 63 +++++-
Marlin/src/lcd/menu/menu.cpp | 1 +
Marlin/src/lcd/menu/menu.h | 200 ++++++++++++--------
Marlin/src/lcd/menu/menu_addon.h | 3 -
Marlin/src/lcd/menu/menu_configuration.cpp | 28 +--
Marlin/src/lcd/menu/menu_filament.cpp | 23 ++-
Marlin/src/lcd/menu/menu_temperature.cpp | 150 ++++++---------
Marlin/src/lcd/menu/menu_ubl.cpp | 97 ++++++----
Marlin/src/lcd/ultralcd.cpp | 31 ++-
Marlin/src/lcd/ultralcd.h | 9 +-
51 files changed, 1181 insertions(+), 872 deletions(-)
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index b60e03fc90..09c9e8fbeb 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -47,6 +47,8 @@
*
* H # Hotend Set the Nozzle Temperature. If not specified, a default of 205 C. will be assumed.
*
+ * I # Preset Heat the Nozzle and Bed based on a Material Preset (if material presets are defined).
+ *
* F # Filament Used to specify the diameter of the filament being used. If not specified
* 1.75mm filament is assumed. If you are not getting acceptable results by using the
* 'correct' numbers, you can scale this number up or down a little bit to change the amount
@@ -140,7 +142,7 @@
constexpr float g26_e_axis_feedrate = 0.025;
static MeshFlags circle_flags, horizontal_mesh_line_flags, vertical_mesh_line_flags;
-float random_deviation = 0.0;
+float g26_random_deviation = 0.0;
static bool g26_retracted = false; // Track the retracted state of the nozzle so mismatched
// retracts/recovers won't result in a bad state.
@@ -193,7 +195,7 @@ mesh_index_pair find_closest_circle_to_print(const xy_pos_t &pos) {
f += (g26_xy_pos - m).magnitude() / 15.0f;
// Add the specified amount of Random Noise to our search
- if (random_deviation > 1.0) f += random(0.0, random_deviation);
+ if (g26_random_deviation > 1.0) f += random(0.0, g26_random_deviation);
if (f < closest) {
closest = f; // Found a closer un-printed location
@@ -508,15 +510,35 @@ void GcodeSuite::G26() {
bool g26_continue_with_closest = parser.boolval('C'),
g26_keep_heaters_on = parser.boolval('K');
+ // Accept 'I' if temperature presets are defined
+ const uint8_t preset_index = (0
+ #if PREHEAT_COUNT
+ + (parser.seenval('I') ? _MIN(parser.value_byte(), PREHEAT_COUNT - 1) + 1 : 0)
+ #endif
+ );
+
#if HAS_HEATED_BED
- if (parser.seenval('B')) {
- g26_bed_temp = parser.value_celsius();
- if (g26_bed_temp && !WITHIN(g26_bed_temp, 40, BED_MAX_TARGET)) {
+
+ // Get a temperature from 'I' or 'B'
+ int16_t bedtemp = 0;
+
+ // Use the 'I' index if temperature presets are defined
+ #if PREHEAT_COUNT
+ if (preset_index) bedtemp = ui.material_preset[preset_index - 1].bed_temp;
+ #endif
+
+ // Look for 'B' Bed Temperature
+ if (parser.seenval('B')) bedtemp = parser.value_celsius();
+
+ if (bedtemp) {
+ if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) {
SERIAL_ECHOLNPAIR("?Specified bed temperature not plausible (40-", int(BED_MAX_TARGET), "C).");
return;
}
+ g26_bed_temp = bedtemp;
}
- #endif
+
+ #endif // HAS_HEATED_BED
if (parser.seenval('L')) {
g26_layer_height = parser.value_linear_units();
@@ -580,20 +602,34 @@ void GcodeSuite::G26() {
g26_extrusion_multiplier *= g26_filament_diameter * sq(g26_nozzle) / sq(0.3); // Scale up by nozzle size
- if (parser.seenval('H')) {
- g26_hotend_temp = parser.value_celsius();
- if (!WITHIN(g26_hotend_temp, 165, (HEATER_0_MAXTEMP) - (HOTEND_OVERSHOOT))) {
+ // Get a temperature from 'I' or 'H'
+ int16_t noztemp = 0;
+
+ // Accept 'I' if temperature presets are defined
+ #if PREHEAT_COUNT
+ if (preset_index) noztemp = ui.material_preset[preset_index - 1].hotend_temp;
+ #endif
+
+ // Look for 'H' Hotend Temperature
+ if (parser.seenval('H')) noztemp = parser.value_celsius();
+
+ // If any preset or temperature was specified
+ if (noztemp) {
+ if (!WITHIN(noztemp, 165, (HEATER_0_MAXTEMP) - (HOTEND_OVERSHOOT))) {
SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible.");
return;
}
+ g26_hotend_temp = noztemp;
}
+ // 'U' to Randomize and optionally set circle deviation
if (parser.seen('U')) {
randomSeed(millis());
// This setting will persist for the next G26
- random_deviation = parser.has_value() ? parser.value_float() : 50.0;
+ g26_random_deviation = parser.has_value() ? parser.value_float() : 50.0;
}
+ // Get repeat from 'R', otherwise do one full circuit
int16_t g26_repeats;
#if HAS_LCD_MENU
g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
@@ -610,6 +646,7 @@ void GcodeSuite::G26() {
return;
}
+ // Set a position with 'X' and/or 'Y'. Default: current_position
g26_xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x,
parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y);
if (!position_is_reachable(g26_xy_pos)) {
diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
index bb453412d7..f8eca4bc02 100644
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -50,7 +50,12 @@
#endif
/**
- * M104: Set hot end temperature
+ * M104: Set Hotend Temperature target and return immediately
+ *
+ * Parameters:
+ * I<preset> : Material Preset index (if material presets are defined)
+ * T<index> : Tool index. If omitted, applies to the active tool
+ * S<target> : The target temperature in current units
*/
void GcodeSuite::M104() {
@@ -63,8 +68,25 @@ void GcodeSuite::M104() {
if (target_extruder < 0) return;
#endif
- if (parser.seenval('S')) {
- const int16_t temp = parser.value_celsius();
+ bool got_temp = false;
+ int16_t temp = 0;
+
+ // Accept 'I' if temperature presets are defined
+ #if PREHEAT_COUNT
+ got_temp = parser.seenval('I');
+ if (got_temp) {
+ const uint8_t index = parser.value_byte();
+ temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp;
+ }
+ #endif
+
+ // If no 'I' get the temperature from 'S'
+ if (!got_temp) {
+ got_temp = parser.seenval('S');
+ if (got_temp) temp = parser.value_celsius();
+ }
+
+ if (got_temp) {
#if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
singlenozzle_temp[target_extruder] = temp;
if (target_extruder != active_extruder) return;
@@ -91,10 +113,25 @@ void GcodeSuite::M104() {
}
/**
- * M109: Sxxx Wait for hotend(s) to reach temperature. Waits only when heating.
- * Rxxx Wait for hotend(s) to reach temperature. Waits when heating and cooling.
+ * M109: Set Hotend Temperature target and wait
+ *
+ * Parameters
+ * I<preset> : Material Preset index (if material presets are defined)
+ * T<index> : Tool index. If omitted, applies to the active tool
+ * S<target> : The target temperature in current units. Wait for heating only.
+ * R<target> : The target temperature in current units. Wait for heating and cooling.
*
- * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating and stop it if turned off.
+ * With AUTOTEMP...
+ * F<factor> : Autotemp Scaling Factor. Set non-zero to enable Auto-temp.
+ * S<min> : Minimum temperature, in current units.
+ * B<max> : Maximum temperature, in current units.
+ *
+ * Examples
+ * M109 S100 : Set target to 100°. Wait until the hotend is at or above 100°.
+ * M109 R150 : Set target to 150°. Wait until the hotend gets close to 150°.
+ *
+ * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer
+ * (used by printingIsActive, etc.) and turning off heaters will stop the timer.
*/
void GcodeSuite::M109() {
@@ -107,10 +144,27 @@ void GcodeSuite::M109() {
if (target_extruder < 0) return;
#endif
- const bool no_wait_for_cooling = parser.seenval('S'),
- set_temp = no_wait_for_cooling || parser.seenval('R');
- if (set_temp) {
- const int16_t temp = parser.value_celsius();
+ bool got_temp = false;
+ int16_t temp = 0;
+
+ // Accept 'I' if temperature presets are defined
+ #if PREHEAT_COUNT
+ got_temp = parser.seenval('I');
+ if (got_temp) {
+ const uint8_t index = parser.value_byte();
+ temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp;
+ }
+ #endif
+
+ // Get the temperature from 'S' or 'R'
+ bool no_wait_for_cooling = false;
+ if (!got_temp) {
+ no_wait_for_cooling = parser.seenval('S');
+ got_temp = no_wait_for_cooling || parser.seenval('R');
+ if (got_temp) temp = int16_t(parser.value_celsius());
+ }
+
+ if (got_temp) {
#if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
singlenozzle_temp[target_extruder] = temp;
if (target_extruder != active_extruder) return;
@@ -139,7 +193,7 @@ void GcodeSuite::M109() {
TERN_(AUTOTEMP, planner.autotemp_M104_M109());
- if (set_temp)
+ if (got_temp)
(void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling);
}
diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
index 7fbc53297e..ffc00eafa3 100644
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -28,6 +28,10 @@
#include "../../module/motion.h"
#include "../../module/temperature.h"
+#if PREHEAT_COUNT
+ #include "../../lcd/ultralcd.h"
+#endif
+
#if ENABLED(SINGLENOZZLE)
#define _ALT_P active_extruder
#define _CNT_P EXTRUDERS
@@ -39,6 +43,7 @@
/**
* M106: Set Fan Speed
*
+ * I<index> Material Preset index (if material presets are defined)
* S<int> Speed between 0-255
* P<index> Fan index, if more than one fan
*
@@ -50,19 +55,32 @@
* 3-255 = Set the speed for use with T2
*/
void GcodeSuite::M106() {
- const uint8_t p = parser.byteval('P', _ALT_P);
+ const uint8_t pfan = parser.byteval('P', _ALT_P);
- if (p < _CNT_P) {
+ if (pfan < _CNT_P) {
#if ENABLED(EXTRA_FAN_SPEED)
const uint16_t t = parser.intval('T');
- if (t > 0) return thermalManager.set_temp_fan_speed(p, t);
+ if (t > 0) return thermalManager.set_temp_fan_speed(pfan, t);
+ #endif
+
+ const uint16_t dspeed = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255;
+
+ uint16_t speed = dspeed;
+
+ // Accept 'I' if temperature presets are defined
+ #if PREHEAT_COUNT
+ const bool got_preset = parser.seenval('I');
+ if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed;
+ #else
+ constexpr bool got_preset = false;
#endif
- uint16_t d = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255;
- uint16_t s = parser.ushortval('S', d);
- NOMORE(s, 255U);
- thermalManager.set_fan_speed(p, s);
+ if (!got_preset && parser.seenval('S'))
+ speed = parser.value_ushort();
+
+ // Set speed, with constraint
+ thermalManager.set_fan_speed(pfan, speed);
}
}
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index 394ce2de17..4af09bdfe0 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -47,11 +47,33 @@
/**
* M140: Set bed temperature
+ *
+ * I<index> : Preset index (if material presets are defined)
+ * S<target> : The target temperature in current units
*/
void GcodeSuite::M140() {
if (DEBUGGING(DRYRUN)) return;
- if (parser.seenval('S')) {
- thermalManager.setTargetBed(parser.value_celsius());
+
+ bool got_temp = false;
+ int16_t temp = 0;
+
+ // Accept 'I' if temperature presets are defined
+ #if PREHEAT_COUNT
+ got_temp = parser.seenval('I');
+ if (got_temp) {
+ const uint8_t index = parser.value_byte();
+ temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp;
+ }
+ #endif
+
+ // If no 'I' get the temperature from 'S'
+ if (!got_temp) {
+ got_temp = parser.seenval('S');
+ if (got_temp) temp = parser.value_celsius();
+ }
+
+ if (got_temp) {
+ thermalManager.setTargetBed(temp);
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
/**
@@ -65,20 +87,48 @@ void GcodeSuite::M140() {
}
/**
- * M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating
- * Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
+ * M190 - Set Bed Temperature target and wait
+ *
+ * Parameters:
+ * I<index> : Preset index (if material presets are defined)
+ * S<target> : The target temperature in current units. Wait for heating only.
+ * R<target> : The target temperature in current units. Wait for heating and cooling.
*
- * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating.
+ * Examples:
+ * M190 S60 : Set target to 60°. Wait until the bed is at or above 60°.
+ * M190 R40 : Set target to 40°. Wait until the bed gets close to 40°.
+ *
+ * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer
+ * (used by printingIsActive, etc.) and turning off heaters will stop the timer.
*/
void GcodeSuite::M190() {
if (DEBUGGING(DRYRUN)) return;
- const bool no_wait_for_cooling = parser.seenval('S');
- if (no_wait_for_cooling || parser.seenval('R')) {
- thermalManager.setTargetBed(parser.value_celsius());
- TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false));
+ bool got_temp = false;
+ int16_t temp = 0;
+
+ // Accept 'I' if temperature presets are defined
+ #if PREHEAT_COUNT
+ got_temp = parser.seenval('I');
+ if (got_temp) {
+ const uint8_t index = parser.value_byte();
+ temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp;
+ }
+ #endif
+
+ // Get the temperature from 'S' or 'R'
+ bool no_wait_for_cooling = false;
+ if (!got_temp) {
+ no_wait_for_cooling = parser.seenval('S');
+ got_temp = no_wait_for_cooling || parser.seenval('R');
+ if (got_temp) temp = int16_t(parser.value_celsius());
}
- else return;
+
+ if (!got_temp) return;
+
+ thermalManager.setTargetBed(temp);
+
+ TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false));
ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING));
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 877518c897..10755c180e 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -589,14 +589,6 @@
#define NUM_SERVOS 0
#endif
-#ifndef PREHEAT_1_LABEL
- #define PREHEAT_1_LABEL "PLA"
-#endif
-
-#ifndef PREHEAT_2_LABEL
- #define PREHEAT_2_LABEL "ABS"
-#endif
-
/**
* Set a flag for a servo probe (or BLTouch)
*/
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 04af5e40c9..6d9998b692 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2129,9 +2129,17 @@
#endif
#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD)
- #define PREHEAT_COUNT 2
-#else
- #undef PREHEAT_COUNT
+ #ifdef PREHEAT_5_LABEL
+ #define PREHEAT_COUNT 5
+ #elif defined(PREHEAT_4_LABEL)
+ #define PREHEAT_COUNT 4
+ #elif defined(PREHEAT_3_LABEL)
+ #define PREHEAT_COUNT 3
+ #elif defined(PREHEAT_2_LABEL)
+ #define PREHEAT_COUNT 2
+ #elif defined(PREHEAT_1_LABEL)
+ #define PREHEAT_COUNT 1
+ #endif
#endif
/**
diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
index 21e8130850..5b1de8008a 100644
--- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
@@ -1004,7 +1004,7 @@ void MarlinUI::draw_status_screen() {
int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2;
while (--pad >= 0) { lcd_put_wchar(' '); n--; }
}
- n = lcd_put_u8str_ind_P(pstr, itemIndex, n);
+ n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n);
if (valstr) n -= lcd_put_u8str_max(valstr, n);
for (; n > 0; --n) lcd_put_wchar(' ');
}
@@ -1012,20 +1012,20 @@ void MarlinUI::draw_status_screen() {
// Draw a generic menu item with pre_char (if selected) and post_char
void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char) {
lcd_put_wchar(0, row, sel ? pre_char : ' ');
- uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2);
+ uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2);
for (; n; --n) lcd_put_wchar(' ');
lcd_put_wchar(post_char);
}
// Draw a menu item with a (potentially) editable value
- void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) {
- const uint8_t vlen = data ? (pgm ? utf8_strlen_P(data) : utf8_strlen(data)) : 0;
+ void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm) {
+ const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0;
lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
- uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2 - vlen);
+ uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
if (vlen) {
lcd_put_wchar(':');
for (; n; --n) lcd_put_wchar(' ');
- if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str(data);
+ if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
}
}
@@ -1033,7 +1033,7 @@ void MarlinUI::draw_status_screen() {
void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) {
ui.encoder_direction_normal();
- uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, LCD_WIDTH - 1);
+ uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, itemString, LCD_WIDTH - 1);
if (value != nullptr) {
lcd_put_wchar(':');
int len = utf8_strlen(value);
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
index e26b990a24..728d028deb 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
@@ -359,7 +359,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
n -= MENU_FONT_WIDTH;
}
- n = lcd_put_u8str_ind_P(pstr, itemIndex, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
+ n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
if (valstr) n -= lcd_put_u8str_max(valstr, n);
while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
}
@@ -368,7 +368,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
// Draw a generic menu item
void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char, const char post_char) {
if (mark_as_selected(row, sel)) {
- pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
+ pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
lcd_put_wchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char);
lcd_put_wchar(' ');
@@ -376,17 +376,17 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
}
// Draw a menu item with an editable value
- void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) {
+ void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm) {
if (mark_as_selected(row, sel)) {
- const uint8_t vallen = (pgm ? utf8_strlen_P(data) : utf8_strlen((char*)data)),
- pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), data) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)data));
+ const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen((char*)inStr)),
+ pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)inStr));
- pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH);
+ pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH);
if (vallen) {
lcd_put_wchar(':');
while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
lcd_moveto(LCD_PIXEL_WIDTH - _MAX((MENU_FONT_WIDTH) * vallen, pixelwidth + 2), row_y2);
- if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str((char*)data);
+ if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str((char*)inStr);
}
}
}
@@ -423,7 +423,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
// Assume the label is alpha-numeric (with a descender)
bool onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline + EDIT_FONT_DESCENT);
- if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex);
+ if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex, itemString);
// If a value is included, print a colon, then print the value right-justified
if (value != nullptr) {
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
index b83a175589..61a0a94abc 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
@@ -230,42 +230,6 @@
#define PAGE_UNDER(yb) ((yb) >= u8g.getU8g()->current_page.y0) // Does the current page precede a region bottom?
#define PAGE_CONTAINS(ya, yb) ((yb) >= u8g.getU8g()->current_page.y0 && (ya) <= u8g.getU8g()->current_page.y1) // Do two vertical regions overlap?
-// Only Western languages support big / small fonts
-#if DISABLED(DISPLAY_CHARSET_ISO10646_1)
- #undef USE_BIG_EDIT_FONT
- #undef USE_SMALL_INFOFONT
-#endif
-
-#define MENU_FONT_NAME ISO10646_1_5x7
-#define MENU_FONT_WIDTH 6
-#define MENU_FONT_ASCENT 10
-#define MENU_FONT_DESCENT 2
-#define MENU_FONT_HEIGHT (MENU_FONT_ASCENT + MENU_FONT_DESCENT)
-
-#if ENABLED(USE_BIG_EDIT_FONT)
- #define EDIT_FONT_NAME u8g_font_9x18
- #define EDIT_FONT_WIDTH 9
- #define EDIT_FONT_ASCENT 10
- #define EDIT_FONT_DESCENT 3
-#else
- #define EDIT_FONT_NAME MENU_FONT_NAME
- #define EDIT_FONT_WIDTH MENU_FONT_WIDTH
- #define EDIT_FONT_ASCENT MENU_FONT_ASCENT
- #define EDIT_FONT_DESCENT MENU_FONT_DESCENT
-#endif
-#define EDIT_FONT_HEIGHT (EDIT_FONT_ASCENT + EDIT_FONT_DESCENT)
-
-// Get the Ascent, Descent, and total Height for the Info Screen font
-#if ENABLED(USE_SMALL_INFOFONT)
- extern const u8g_fntpgm_uint8_t u8g_font_6x9[];
- #define INFO_FONT_ASCENT 7
-#else
- #define INFO_FONT_ASCENT 8
-#endif
-#define INFO_FONT_DESCENT 2
-#define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT)
-#define INFO_FONT_WIDTH 6
-
#ifndef FSMC_UPSCALE
#define FSMC_UPSCALE 2
#endif
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 89c36f754f..324c5b2c01 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -56,20 +56,23 @@ namespace Language_an {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Boquilla ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precalentar $ Tot");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precalentar $ Base");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precalentar $ Conf");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Amortar Fuent");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index aa7875e44b..e7c497e7eb 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -46,20 +46,23 @@ namespace Language_bg {
PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Паркиране");
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Ðачало");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL _UxGT(" Дюза");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL _UxGT(" Дюза ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Ð’Ñички");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("ÐаÑтройки ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("ПодгрÑване ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("ПодгрÑване ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("ПодгрÑване ") PREHEAT_2_LABEL _UxGT(" Дюза");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("ПодгрÑване ") PREHEAT_2_LABEL _UxGT(" Дюза ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Ð’Ñички");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("ÐаÑтройки ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL _UxGT(" Дюза");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("ПодгрÑване ") PREHEAT_1_LABEL _UxGT(" Дюза ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Ð’Ñички");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("ÐаÑтройки ") PREHEAT_1_LABEL;
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("ПодгрÑване $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("ПодгрÑване $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("ПодгрÑване $ Дюза");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("ПодгрÑване $ Дюза ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Подгр. $ Ð’Ñички");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Подгр. $ Легло");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("ÐаÑтройки $");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Изкл. захранване");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 93a0af243e..3eed7933c5 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -54,20 +54,23 @@ namespace Language_ca {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf.");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf.");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf.");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preescalfa $ End ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preescalfa $ Tot");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preescalfa $ Llit");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preescalfa $ Conf.");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda");
PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Extrudeix");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index a46b4affda..3796284f4e 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -79,20 +79,23 @@ namespace Language_cz {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastavit ofsety");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit poÄátek");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Zahřát $ end ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Zahřát $ vše");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Zahřát $ podlož");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Zahřát $ nast");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastnÃ");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit");
PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Ovládánà laseru");
@@ -156,14 +159,14 @@ namespace Language_cz {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sÃtÄ›");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastnà sÃÅ¥");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("VytvoÅ™it sÃÅ¥");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("SÃÅ¥ bodů ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("SÃÅ¥ bodů ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("SÃÅ¥ bodů $");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sÃtÄ› $");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sÃÅ¥ bodů");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sÃtÄ›");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat sÃÅ¥");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sÃtÄ› ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sÃtÄ› ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sÃtÄ›");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahÅ™Ãvánà podl.");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 zaÅ™Ãvánà trysky");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index d8c63447d8..fc69aa55c3 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -49,20 +49,23 @@ namespace Language_da {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Sæt forsk. af home");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end")
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end")
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end")
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end")
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Forvarm $ end ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Forvarm $ Alle");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Forvarm $ Bed");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Forvarm $ conf");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Slå strøm fra");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index f2cb0cf3f3..2d14f47b16 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -64,20 +64,23 @@ namespace Language_de {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Setze Homeversatz");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
- PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen");
- PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~";
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ Bett Vorwärmen");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ Einstellungen");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequenz");
@@ -140,14 +143,14 @@ namespace Language_de {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Bearbeitung beendet");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst.");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst.");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Düse aufheizen");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 17e4e819c1..eb288ba8ab 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -54,20 +54,23 @@ namespace Language_el {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("ΟÏισμός βασικών μετατοπίσεων"); //SHORTEN
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("ΕφαÏμόστηκαν οι μετατοπίσεις"); //SHORTEN
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("ΟÏισμός Ï€ÏοÎλευσης");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" όλα");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Î ÏοθÎÏμανση $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Î ÏοθÎÏμανση $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Î ÏοθÎÏμανση $ End");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Î ÏοθÎÏμανση $ End ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Î ÏοθÎÏμανση $ όλα");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Î ÏοθÎÏμανση $ bed"); //SHORTEN
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Î ÏοθÎÏμανση $ επιβεβαίωση"); //SHORTEN
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θεÏμοκÏασιας");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("ΕνεÏγοποίηση");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("ΑπενεÏγοποίηση");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index d107f42f7b..c79bca37d4 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -55,20 +55,23 @@ namespace Language_el_gr {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("ΟÏισμός βασικών μετατοπίσεων");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("ΕφαÏμόστηκαν οι μετατοπίσεις");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("ΟÏισμός Ï€ÏοÎλευσης");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" όλα");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Î ÏοθÎÏμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Î ÏοθÎÏμανση $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Î ÏοθÎÏμανση $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Î ÏοθÎÏμανση $ End");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Î ÏοθÎÏμανση $ End ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Î ÏοθÎÏμανση $ όλα");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Î ÏοθÎÏμανση $ κλίνη");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Î ÏοθÎÏμανση $ επιβεβαίωση");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θεÏμοκÏασιας");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("ΕνεÏγοποίηση");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("ΑπενεÏγοποίηση");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 788bc230bf..d70b007c6e 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -74,20 +74,23 @@ namespace Language_en {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Set Home Offsets");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preheat $ End ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preheat $ All");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preheat $ Bed");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preheat $ Conf");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequency");
@@ -150,14 +153,12 @@ namespace Language_en {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")");
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Build Mesh ($)");
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index e1d7562d00..bd63e6479e 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -69,20 +69,23 @@ namespace Language_es {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajustar desfases");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $");
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecuencia");
@@ -145,14 +148,14 @@ namespace Language_es {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Term. edici. Mallado");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers.");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crear Mallado ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valid. Mall. ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado FrÃo");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso.");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Calent. Boquilla");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 428d282d38..35c4717a40 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -58,20 +58,23 @@ namespace Language_eu {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Etxe. offset eza.");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp.");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp.");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp.");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Berotu $ Amaia ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Berotu $ Guztia");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Berotu $ Ohea");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Berotu $ Ezarp.");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Energia itzali");
@@ -98,13 +101,13 @@ namespace Language_eu {
PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Sarea editatu");
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi");
PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi");
PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa");
PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 59bdf8d6d6..8166fa3136 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -45,20 +45,23 @@ namespace Language_fi {
PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("Vapauta moottorit");
PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Esilä. $Suutin ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Esilä. $ Kaikki");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Esilä. $ Alusta");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Esilämm. $ konf");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Virta pois");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index bb6c9269e2..72cbfcf3c1 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -70,20 +70,23 @@ namespace Language_fr {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Régl. décal origine");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL;
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Préch. $ buse ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Préch. $ Tout");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Préch. $ lit");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Régler préch. $");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir");
PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Contrôle Laser");
@@ -146,15 +149,15 @@ namespace Language_fr {
PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin");
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ...");
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajuster haut. couche");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ...");
PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille");
PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 097efeb35a..66187e8a6b 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -72,20 +72,23 @@ namespace Language_gl {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Axustar Desfases");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preque. $ Bico ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preque. $ Todo");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preque. $ Cama");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preque. $ conf");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali.");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecuencia");
@@ -148,14 +151,14 @@ namespace Language_gl {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fin Edición da Malla");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person.");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crear Malla ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validar Malla ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla FrÃa");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso.");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Quentando Bico");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index e50d4b8d77..24a1f1dcc7 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -55,20 +55,23 @@ namespace Language_hr {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Postavi home offsete");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Predgrij $ Dizna ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Predgrij $ Sve");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Predgrij $ Bed");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Predgrij $ conf");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("UkljuÄi napajanje");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("IskljuÄi napajanje");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 3d2101b824..de38cb52da 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -74,20 +74,23 @@ namespace Language_hu {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Kezdöpont eltolás");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállÃtva.");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ãgy");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ãgy");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ãgy");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Fütés $ Fej ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Fütés $ Mind");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Fütés $ Ãgy");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Fütés $ Beáll");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi ElömelegÃtés");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frekvencia");
@@ -150,14 +153,14 @@ namespace Language_hu {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Háló Kész");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló ÉpÃtés");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló ÉpÃtés");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló ÉpÃtés (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló ÉpÃtés (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Háló ÉpÃtés ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Háló Elfogadás ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló ÉpÃtés");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság ÃllÃtása");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ãgy Fűtés");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Fúvóka Fűtés");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 76e76355fd..264e7bd053 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -72,20 +72,23 @@ namespace Language_it {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Imp. offset home");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preris.$ Ugello ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preris.$ Tutto");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preris.$ Piatto");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preris.$ conf");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal.");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequenza");
@@ -148,14 +151,14 @@ namespace Language_it {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Modif.Mesh fatta");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal.");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello");
PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("Priming manuale...");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 084d8b4831..8a74dcabba 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -63,20 +63,23 @@ namespace Language_jp_kana {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("ã‚ジュンオフセットセッテイ"); // "Set home offsets"
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテã‚ヨウサレマシタ"); // "Offsets applied"
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("ã‚ジュンセット"); // "Set origin"
- PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„"); // "Preheat " PREHEAT_1_LABEL
- PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„ ~"); // "Preheat " PREHEAT_1_LABEL
- PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„ノズル"); // " Nozzle"
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„ノズル ~"); // " Nozzle"
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨãƒãƒ„"); // " All"
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨãƒãƒ„"); // " Bed"
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„セッテイ"); // " conf"
- PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨãƒãƒ„"); // "Preheat " PREHEAT_1_LABEL
- PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨãƒãƒ„ ~"); // "Preheat " PREHEAT_1_LABEL
- PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨãƒãƒ„ノズル"); // " Nozzle"
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨãƒãƒ„ノズル ~"); // " Nozzle"
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨãƒãƒ„"); // " All"
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨãƒãƒ„"); // " Bed"
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨãƒãƒ„セッテイ"); // " conf"
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„"); // "Preheat " PREHEAT_1_LABEL
+ PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„ ~"); // "Preheat " PREHEAT_1_LABEL
+ PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„ノズル"); // " Nozzle"
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„ノズル ~"); // " Nozzle"
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨãƒãƒ„"); // " All"
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨãƒãƒ„"); // " Bed"
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨãƒãƒ„セッテイ"); // " conf"
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨãƒãƒ„"); // "Preheat " PREHEAT_1_LABEL
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨãƒãƒ„ ~"); // "Preheat " PREHEAT_1_LABEL
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨãƒãƒ„ノズル"); // " Nozzle"
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨãƒãƒ„ノズル ~"); // " Nozzle"
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨãƒãƒ„"); // " All"
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ ベッドヨãƒãƒ„"); // " Bed"
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ ヨãƒãƒ„セッテイ"); // " conf"
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("ã‚«ãƒãƒ„テイシ"); // "Cooldown"
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on"
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("デンゲン オフ"); // "Switch power off"
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index 8d022e99c0..7627a7d155 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -55,14 +55,17 @@ namespace Language_ko_KR {
PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("누르면 시작합니다");
PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("ë‹¤ìŒ Point");
PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("ë ˆë²¨ë§ ì™„ë£Œ!");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" ë…¸ì¦");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" ë…¸ì¦ ~");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" ë…¸ì¦");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" ë…¸ì¦ ~");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" ë…¸ì¦");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" ë…¸ì¦ ~");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ ë…¸ì¦");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("예열하기 - $ ë…¸ì¦ ~");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Custom 예열");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("ì‹ížˆê¸°");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("스위치 ì „ì› ì¼œê¸°");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 9911f73ead..701f861217 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -55,20 +55,23 @@ namespace Language_nl {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Zet home offsets");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep.");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen");
- PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen");
- PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~");
- PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen");
- PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~");
- PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen");
+ PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ voorverw. Einde ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ voorverw. aan");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ voorverw. Bed");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ verw. conf");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Stroom uit");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index b1da41bc61..9e77eb92d1 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -70,20 +70,23 @@ namespace Language_pl {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ust. poz. zer.");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust.");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz.");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw.");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz.");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw.");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz.");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw.");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Rozgrzej $ Dysza ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Rozgrzej $ wsz.");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Rozgrzej $ stół");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Rozgrzej $ ustaw.");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust.");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie");
PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Sterowanie Lasera");
@@ -145,14 +148,14 @@ namespace Language_pl {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec edycji siati");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkÄ™");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkÄ™ (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkÄ™ (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Buduj siatkÄ™ ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Sprawdzenie siatki ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkÄ™ na zimno");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Nagrzewanie dyszy");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index bc7465716c..41bfdc7414 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -54,20 +54,23 @@ namespace Language_pt {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Definir desvio");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL;
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Pre-aquecer $ Bico ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Pre-aq. $ Tudo");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Pre-aq. $ ") LCD_STR_THERMOMETER _UxGT("Base");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Definições $");
+ #endif
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar");
PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Desligar");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index bf4b834303..49a336ce3f 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -69,20 +69,23 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Compensar origem");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL;
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Extrusora $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Pre-aq.Todo $");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Pre-aq.Mesa $");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ajustar $");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq.");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar");
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar");
@@ -132,14 +135,14 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fim da Edição");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar ");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Aquecendo Ext.");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index da9a159a3f..51f1a00101 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -70,20 +70,23 @@ namespace Language_ro {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Seteaza Offseturile Acasa");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preincalzeste $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preincalzeste $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preincalzeste $ Capatul");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preincalzeste $ Capatul ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preincalzeste $ Tot");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preincalzeste $ Patul");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preincalzeste $ Conf");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecventa");
@@ -146,14 +149,14 @@ namespace Language_ro {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Build Mesh ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 77e309fdae..15d23e1326 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -78,20 +78,23 @@ namespace Language_ru {
#endif
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ð¡Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ñ‹");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("УÑтановить ноль");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ðагрев ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" Ñопло");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" Ñопло ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" вÑÑ‘");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" Ñтол");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" правка");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ðагрев ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ðагрев ") PREHEAT_2_LABEL _UxGT(" Ñопло");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ðагрев ") PREHEAT_2_LABEL _UxGT(" Ñопло ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ðагрев ") PREHEAT_2_LABEL _UxGT(" вÑÑ‘");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ðагрев ") PREHEAT_2_LABEL _UxGT(" Ñтол");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ðагрев ") PREHEAT_2_LABEL _UxGT(" правка");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ðагрев ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" Ñопло");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" Ñопло ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" вÑÑ‘");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" Ñтол");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ðагрев ") PREHEAT_1_LABEL _UxGT(" правка");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ðагрев $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ðагрев $ Ñопло");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Ðагрев $ Ñопло ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Ðагрев $ вÑÑ‘");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Ðагрев $ Ñтол");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ðагрев $ правка");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Ðагрев Свой");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("ЧаÑтота");
@@ -184,8 +187,9 @@ namespace Language_ru {
#endif
PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Ð¢Ð¾Ñ‡Ð½Ð°Ñ Ð¿Ñ€Ð°Ð²ÐºÐ° Ñетки");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("ПоÑтроить Ñетку");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("ПоÑтроить Ñетку ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("ПоÑтроить Ñетку ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("ПоÑтроить Ñетку $");
+ #endif
#if LCD_WIDTH > 21
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("ПоÑтроить холодную Ñетку");
#else
@@ -195,12 +199,14 @@ namespace Language_ru {
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Ð’Ñ‹Ñота");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Проверить Ñетку");
#if LCD_WIDTH > 21
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить Ñетку ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить Ñетку ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Проверить Ñетку $");
+ #endif
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Проверить Ñвою Ñетку");
#else
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. Ñетку ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. Ñетку ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Провер. Ñетку $");
+ #endif
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Провер. Ñвою Ñетку");
#endif
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрев Ñтола");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 0a251f1548..a4c47951f1 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -74,20 +74,23 @@ namespace Language_sk {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastaviť ofsety");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("NastaviÅ¥ zaÄiatok");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast.");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast.");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast.");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Zahriať $ hotend ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Zahriať $ všetko");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Zahriať $ podlož");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Zahriať $ nast.");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frekvencia");
@@ -150,14 +153,14 @@ namespace Language_sk {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec úprav siete");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž.");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 ohrev trysky");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 8776eee8f4..9ff62d70d6 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -75,20 +75,23 @@ namespace Language_tr {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla");
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Ön Isınma $ Nozul ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Ön Isınma $ Tüm");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Ön Isınma $ Tabla");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ön Isınma $ Ayarlar");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("SoÄŸut/(Durdur)");
PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Lazer Kontrolü");
@@ -150,14 +153,14 @@ namespace Language_tr {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Mesh Düzenleme Tamam");
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh OluÅŸtur");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh OluÅŸtur (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh OluÅŸtur (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Mesh OluÅŸtur ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("DoÄŸrulama Mesh ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("SoÄŸuk Mesh OluÅŸtur");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("DoÄŸrulama Mesh");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("DoÄŸrulama Mesh (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("DoÄŸrulama Mesh (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Isıtma Memesi");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 2751a640bb..55e0eb4d3f 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -80,20 +80,23 @@ namespace Language_uk {
#endif
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ð—Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð¹Ð½ÑÑ‚Ñ–");
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ð’Ñтановити ноль");
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ðагрів ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ðагрів ") PREHEAT_1_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" Ñопло");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" Ñопло ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" вÑе");
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" Ñтіл");
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" налашт");
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ðагрів ") PREHEAT_2_LABEL;
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ðагрів ") PREHEAT_2_LABEL " ~";
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ðагрів ") PREHEAT_2_LABEL _UxGT(" Ñопло");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ðагрів ") PREHEAT_2_LABEL _UxGT(" Ñопло ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ðагрів ") PREHEAT_2_LABEL _UxGT(" вÑе");
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ðагрів ") PREHEAT_2_LABEL _UxGT(" Ñтіл");
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ðагрів ") PREHEAT_2_LABEL _UxGT(" налашт");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ðагрів ") PREHEAT_1_LABEL;
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ðагрів ") PREHEAT_1_LABEL " ~";
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" Ñопло");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" Ñопло ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" вÑе");
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" Ñтіл");
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ðагрів ") PREHEAT_1_LABEL _UxGT(" налашт");
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ðагрів $");
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ðагрів $ ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ðагрів $ Ñопло");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Ðагрів $ Ñопло ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Ðагрів $ вÑе");
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Ðагрів $ Ñтіл");
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ðагрів $ налашт");
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Ðагрів Свій");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів");
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("ЧаÑтота");
@@ -185,14 +188,14 @@ namespace Language_uk {
PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñітки");
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована");
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати Ñітку");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати Ñітку ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати Ñітку ") PREHEAT_2_LABEL;
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати Ñітку $");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну Ñітку");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ð’Ñтан.виÑоту Ñітки");
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("ВиÑота");
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити Ñітку");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL;
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL;
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити Ñвою");
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів Ñтолу");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 нагрів Ñопла");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 4450e98520..9d0ba7e213 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -65,20 +65,23 @@ namespace Language_vi {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Äặt bù đắp nhà "); // Set home offsets
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Äặt nguồn gốc"); // Set origin
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Äầu");
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Äầu ~");
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Bà n"); // bed -- using vietnamese term for 'table' instead
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" Äầu");
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" Äầu ~");
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" Bà n"); // bed -- using vietnamese term for 'table' instead
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Là m nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Äầu");
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Äầu ~");
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Bà n"); // bed -- using vietnamese term for 'table' instead
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Là m nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Là m nóng $ trước"); // Preheat
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Là m nóng $ trước ~"); // Preheat
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Là m nóng $ Äầu");
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Là m nóng $ Äầu ~");
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Là m nóng $ Tất cả"); // all
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Là m nóng $ Bà n"); // bed -- using vietnamese term for 'table' instead
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Là m nóng $ Cấu hình"); // conf
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("SÆ°Ì£ nóng trÆ°á»›c tá»± chá»n"); // Preheat Custom
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown
PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Báºt nguồn"); // Switch power on
@@ -124,14 +127,14 @@ namespace Language_vi {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Chỉnh sá»a xong lÆ°á»›i"); // Done Editing Mesh
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dá»±ng lÆ°á»›i tá»± chá»n"); // Build Custom Mesh
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")");
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Xây dựng lưới ($)");
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Thẩm tra lưới ($)");
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Äiá»u chỉnh chiá»u cao lÆ°á»›i"); // Adjust Mesh Height
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiá»u cao"); // Height Amount
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")");
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")");
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lÆ°á»›i tá»± chá»n"); // validate custom mesh
PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bà n"); // Continue Bed Mesh
PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Äang san lấp lÆ°á»›i"); // Mesh Leveling
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 7aaf57d3b5..512d77aa22 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -69,20 +69,23 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("设置原点å移"); //"Set home offsets"
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("å移已å¯ç”¨"); //"Offsets applied"
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin"
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " "
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " "
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All"
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" çƒåºŠ"); //MSG_PREHEAT_1 " Bed"
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf"
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " "
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " "
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All"
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL _UxGT(" çƒåºŠ"); //MSG_PREHEAT_2 " Bed"
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("é¢„çƒ ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf"
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All"
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" çƒåºŠ"); //MSG_PREHEAT_1 " Bed"
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("é¢„çƒ ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf"
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("é¢„çƒ $"); //"Preheat PREHEAT_2_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("é¢„çƒ $ ~"); //"Preheat PREHEAT_2_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("é¢„çƒ $ 喷嘴"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("é¢„çƒ $ 喷嘴 ~"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("é¢„çƒ $ 全部"); //MSG_PREHEAT_1 " All"
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("é¢„çƒ $ çƒåºŠ"); //MSG_PREHEAT_1 " Bed"
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("é¢„çƒ $ 设置"); //MSG_PREHEAT_1 " conf"
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预çƒè‡ªå®šä¹‰");
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("é™æ¸©"); //"Cooldown"
PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("切割频率");
@@ -145,14 +148,14 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完æˆç¼–è¾‘ç½‘æ ¼"); // "Done Editing Mesh"
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("åˆ›è®¾å®¢æˆ·ç½‘æ ¼"); // "Build Custom Mesh"
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("åˆ›è®¾ç½‘æ ¼"); // "Build Mesh"
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" ç½‘æ ¼"); // "Build PREHEAT_1_LABEL Mesh"
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" ç½‘æ ¼"); // "Build PREHEAT_2_LABEL Mesh"
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ ç½‘æ ¼"); // "Build PREHEAT_1_LABEL Mesh"
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ ç½‘æ ¼"); // "Validate PREHEAT_1_LABEL Mesh"
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("åˆ›è®¾å†·ç½‘æ ¼"); // "Build Cold Mesh"
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("è°ƒæ•´ç½‘æ ¼é«˜åº¦"); // "Adjust Mesh Height"
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度åˆè®¡"); // "Height Amount"
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("æ‰¹å‡†ç½‘æ ¼"); // "Validate Mesh"
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" ç½‘æ ¼"); // "Validate PREHEAT_1_LABEL Mesh"
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" ç½‘æ ¼"); // "Validate PREHEAT_2_LABEL Mesh"
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("æ‰¹å‡†å®¢æˆ·ç½‘æ ¼"); // "Validate Custom Mesh"
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26åŠ çƒçƒåºŠ");
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26åŠ çƒå–·å˜´");
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 793890e300..efc9b570bb 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -68,20 +68,23 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("è¨ç½®åŽŸé»žå移"); //"Set home offsets"
PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("å移已啟用"); //"Offsets applied"
PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("è¨ç½®åŽŸé»ž"); //"Set origin"
- PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("é 熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("é 熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " "
- PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " "
- PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All"
- PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed"
- PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" è¨ç½®"); //MSG_PREHEAT_1 " conf"
- PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("é 熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("é 熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL"
- PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("é 熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " "
- PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("é 熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " "
- PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("é 熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All"
- PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("é 熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed"
- PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("é 熱 ") PREHEAT_2_LABEL _UxGT(" è¨ç½®"); //MSG_PREHEAT_2 " conf"
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("é 熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("é 熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All"
+ PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed"
+ PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("é 熱 ") PREHEAT_1_LABEL _UxGT(" è¨ç½®"); //MSG_PREHEAT_1 " conf"
+
+ PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("é 熱 $"); //"Preheat PREHEAT_1_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("é 熱 $ ~"); //"Preheat PREHEAT_1_LABEL"
+ PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("é 熱 $ 噴嘴"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("é 熱 $ 噴嘴 ~"); //MSG_PREHEAT_1 " "
+ PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("é 熱 $ 全部"); //MSG_PREHEAT_1 " All"
+ PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("é 熱 $ 熱床"); //MSG_PREHEAT_1 " Bed"
+ PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("é 熱 $ è¨ç½®"); //MSG_PREHEAT_1 " conf"
+ #endif
PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定é 熱"); //"Preheat Custom"
PROGMEM Language_Str MSG_COOLDOWN = _UxGT("é™æº«"); //"Cooldown"
PROGMEM Language_Str MSG_LASER_MENU = _UxGT("激光控制"); //"Laser Control"
@@ -143,14 +146,14 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完æˆç·¨è¼¯ç¶²æ ¼"); // "Done Editing Mesh"
PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創è¨å®¢æˆ¶ç¶²æ ¼"); // "Build Custom Mesh"
PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創è¨ç¶²æ ¼"); // "Build Mesh"
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("å‰µè¨ ") PREHEAT_1_LABEL _UxGT(" ç¶²æ ¼"); // "Build PREHEAT_1_LABEL Mesh"
- PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("å‰µè¨ ") PREHEAT_2_LABEL _UxGT(" ç¶²æ ¼"); // "Build PREHEAT_2_LABEL Mesh"
+ #if PREHEAT_COUNT
+ PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("å‰µè¨ $ ç¶²æ ¼"); // "Build PREHEAT_1_LABEL Mesh"
+ PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ ç¶²æ ¼"); // "Validate PREHEAT_1_LABEL Mesh"
+ #endif
PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創è¨å†·ç¶²æ ¼"); // "Build Cold Mesh"
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("èª¿æ•´ç¶²æ ¼é«˜åº¦"); // "Adjust Mesh Height"
PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度åˆè¨ˆ"); // "Height Amount"
PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("æ‰¹å‡†ç¶²æ ¼"); // "Validate Mesh"
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" ç¶²æ ¼"); // "Validate PREHEAT_1_LABEL Mesh"
- PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" ç¶²æ ¼"); // "Validate PREHEAT_2_LABEL Mesh"
PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("æ‰¹å‡†å®¢æˆ¶ç¶²æ ¼"); // "Validate Custom Mesh"
PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 åŠ ç†±ç†±åºŠ"); //"G26 Heating Bed"
PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 åŠ ç†±å™´å˜´"); //"G26 Heating Nozzle"
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index d1c0c02cdb..4290bcbb12 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -28,17 +28,16 @@
#if HAS_SPI_LCD
-#include "../inc/MarlinConfig.h"
#include "lcdprint.h"
/**
* lcd_put_u8str_ind_P
* Print a string with an index substituted within it
*/
-lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
+lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
uint8_t *p = (uint8_t*)pstr;
- lcd_uint_t n = maxlen;
- for (; n; n--) {
+ int8_t n = maxlen;
+ for (; n > 0; n--) {
wchar_t ch;
p = get_utf8_value_cb(p, read_byte_rom, &ch);
if (!ch) break;
@@ -46,17 +45,21 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uin
// lcd_put_int(ind); n--; if (ind >= 10) n--;
if (ind >= 0) {
if (ch == '*') { lcd_put_wchar('E'); n--; }
- lcd_put_wchar(ind + ((ch == '=') ? '0' : LCD_FIRST_TOOL));
- n--;
+ if (n) { lcd_put_wchar(ind + ((ch == '=') ? '0' : LCD_FIRST_TOOL)); n--; }
}
else {
PGM_P const b = ind == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED);
lcd_put_u8str_P(b);
n -= utf8_strlen_P(b);
}
- if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n);
- break;
+ if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
+ continue;
}
+ else if (ch == '$' && inStr) {
+ n -= lcd_put_u8str_max_P(inStr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
+ continue;
+ }
+
lcd_put_wchar(ch);
}
return n;
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index ba938b52d7..341cc4f5c2 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -13,11 +13,68 @@
#include "../inc/MarlinConfig.h"
#if HAS_GRAPHICAL_LCD
+
#include "dogm/u8g_fontutf8.h"
typedef u8g_uint_t lcd_uint_t;
+ typedef u8g_int_t lcd_int_t;
+
+ // Only Western languages support big / small fonts
+ #if DISABLED(DISPLAY_CHARSET_ISO10646_1)
+ #undef USE_BIG_EDIT_FONT
+ #undef USE_SMALL_INFOFONT
+ #endif
+
+ #define MENU_FONT_NAME ISO10646_1_5x7
+ #define MENU_FONT_WIDTH 6
+ #define MENU_FONT_ASCENT 10
+ #define MENU_FONT_DESCENT 2
+ #define MENU_FONT_HEIGHT (MENU_FONT_ASCENT + MENU_FONT_DESCENT)
+
+ #if ENABLED(USE_BIG_EDIT_FONT)
+ #define EDIT_FONT_NAME u8g_font_9x18
+ #define EDIT_FONT_WIDTH 9
+ #define EDIT_FONT_ASCENT 10
+ #define EDIT_FONT_DESCENT 3
+ #else
+ #define EDIT_FONT_NAME MENU_FONT_NAME
+ #define EDIT_FONT_WIDTH MENU_FONT_WIDTH
+ #define EDIT_FONT_ASCENT MENU_FONT_ASCENT
+ #define EDIT_FONT_DESCENT MENU_FONT_DESCENT
+ #endif
+ #define EDIT_FONT_HEIGHT (EDIT_FONT_ASCENT + EDIT_FONT_DESCENT)
+
+ // Get the Ascent, Descent, and total Height for the Info Screen font
+ #if ENABLED(USE_SMALL_INFOFONT)
+ extern const u8g_fntpgm_uint8_t u8g_font_6x9[];
+ #define INFO_FONT_ASCENT 7
+ #else
+ #define INFO_FONT_ASCENT 8
+ #endif
+ #define INFO_FONT_DESCENT 2
+ #define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT)
+ #define INFO_FONT_WIDTH 6
+
+ #define SETCURSOR(col, row) lcd_moveto(col * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT))
+ #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT))
+
#else
+
#define _UxGT(a) a
typedef uint8_t lcd_uint_t;
+ typedef int8_t lcd_int_t;
+
+ #define MENU_FONT_WIDTH 1
+ #define MENU_FONT_HEIGHT 1
+ #define EDIT_FONT_WIDTH 1
+ #define EDIT_FONT_HEIGHT 1
+ #define INFO_FONT_WIDTH 1
+ #define INFO_FONT_HEIGHT 1
+ #define LCD_PIXEL_WIDTH LCD_WIDTH
+ #define LCD_PIXEL_HEIGHT LCD_HEIGHT
+
+ #define SETCURSOR(col, row) lcd_moveto(col, row)
+ #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_WIDTH - (len), row)
+
#endif
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
@@ -71,10 +128,10 @@ inline int lcd_put_u8str_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P con
return lcd_put_u8str_P(pstr);
}
-lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen=LCD_WIDTH);
-inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen=LCD_WIDTH) {
+lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH);
+inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
lcd_moveto(col, row);
- return lcd_put_u8str_ind_P(pstr, ind, maxlen);
+ return lcd_put_u8str_ind_P(pstr, ind, inStr, maxlen);
}
inline int lcd_put_u8str(const char* str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); }
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 7c384f1618..676b2d0a43 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -62,6 +62,7 @@ menuPosition screen_history[6];
uint8_t screen_history_depth = 0;
int8_t MenuItemBase::itemIndex; // Index number for draw and action
+PGM_P MenuItemBase::itemString; // A PSTR for substitution
chimera_t editable; // Value Editing
// Menu Edit Items
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 6e916898b9..699324d266 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -63,12 +63,14 @@ typedef void (*selectFunc_t)();
class MenuItemBase {
public:
- // An index to interject in the item label and for
- // use by the action
+ // Index to interject in the item label and/or for use by its action.
static int8_t itemIndex;
+ // An optional pointer for use in display or by the action
+ static PGM_P itemString;
+
// Store the index of the item ahead of use by indexed items
- FORCE_INLINE static void init(const int8_t ind) { itemIndex = ind; }
+ FORCE_INLINE static void init(const int8_t ind=0, PGM_P const pstr=nullptr) { itemIndex = ind; itemString = pstr; }
// Draw an item either selected (pre_char) or not (space) with post_char
static void _draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char);
@@ -221,7 +223,7 @@ class MenuEditItemBase : public MenuItemBase {
public:
// Implemented for HD44780 and DOGM
// Draw the current item at specified row with edit data
- static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm=false);
+ static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm=false);
// Implemented for HD44780 and DOGM
// This low-level method is good to draw from anywhere
@@ -403,15 +405,15 @@ class MenuItem_bool : public MenuEditItemBase {
*/
#define _MENU_INNER_P(TYPE, USE_MULTIPLIER, PLABEL, V...) do { \
- PGM_P const plabel = PLABEL; \
- if (encoderLine == _thisItemNr && ui.use_click()) { \
- _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER); \
- MenuItem_##TYPE::action(plabel, ##V); \
- if (ui.screen_changed) return; \
- } \
- if (ui.should_draw()) \
- MenuItem_##TYPE::draw \
- (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V); \
+ PGM_P const plabel = PLABEL; \
+ if (encoderLine == _thisItemNr && ui.use_click()) { \
+ _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER); \
+ MenuItem_##TYPE::action(plabel, ##V); \
+ if (ui.screen_changed) return; \
+ } \
+ if (ui.should_draw()) \
+ MenuItem_##TYPE::draw \
+ (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V); \
}while(0)
#define _MENU_ITEM_P(TYPE, V...) do { \
@@ -421,11 +423,31 @@ class MenuItem_bool : public MenuEditItemBase {
NEXT_ITEM(); \
}while(0)
+// Indexed items set a global index value and optional data
+#define _MENU_ITEM_N_S_P(TYPE, N, S, V...) do{ \
+ _skipStatic = false; \
+ if (_menuLineNr == _thisItemNr) { \
+ MenuItemBase::init(N, S); \
+ _MENU_INNER_P(TYPE, ##V); \
+ } \
+ NEXT_ITEM(); \
+}while(0)
+
// Indexed items set a global index value
#define _MENU_ITEM_N_P(TYPE, N, V...) do{ \
_skipStatic = false; \
if (_menuLineNr == _thisItemNr) { \
- MenuItemBase::init(N); \
+ MenuItemBase::itemIndex = N; \
+ _MENU_INNER_P(TYPE, ##V); \
+ } \
+ NEXT_ITEM(); \
+}while(0)
+
+// Items with a unique string
+#define _MENU_ITEM_S_P(TYPE, S, V...) do{ \
+ _skipStatic = false; \
+ if (_menuLineNr == _thisItemNr) { \
+ MenuItemBase::itemString = S; \
_MENU_INNER_P(TYPE, ##V); \
} \
NEXT_ITEM(); \
@@ -457,72 +479,94 @@ class MenuItem_bool : public MenuEditItemBase {
NEXT_ITEM(); \
}while(0)
-#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P( GET_TEXT(LABEL), ##V)
-#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V)
-
-#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V)
-#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V)
-
-#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V)
-#define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
-
-#define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL)
-
-#define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION)
-#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION)
-
-#define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION)
-#define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION)
-
-#define GCODES_ITEM_P(PLABEL, GCODES) MENU_ITEM_P(gcode, PLABEL, GCODES)
-#define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES)
-
-#define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES)
-#define GCODES_ITEM_N(N, LABEL, GCODES) GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES)
-
-#define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST)
-#define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST)
-
-#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST)
-#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST)
-
-#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V)
-#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V)
-
-#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V)
-#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
-
-#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V)
-#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V)
-
-#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V)
-#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
+#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P(GET_TEXT(LABEL), ##V)
+#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V)
+
+#define MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, PLABEL, ##V)
+#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V)
+#define MENU_ITEM_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_S_P(TYPE, S, false, PLABEL, ##V)
+#define MENU_ITEM_S(TYPE, S, LABEL, V...) MENU_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V)
+#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V)
+#define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
+#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V)
+#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V)
+
+#define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL)
+
+#define ACTION_ITEM_N_S_P(N, S, PLABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, PLABEL, ACTION)
+#define ACTION_ITEM_N_S(N, S, LABEL, ACTION) ACTION_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ACTION)
+#define ACTION_ITEM_S_P(S, PLABEL, ACTION) MENU_ITEM_S_P(function, S, PLABEL, ACTION)
+#define ACTION_ITEM_S(S, LABEL, ACTION) ACTION_ITEM_S_P(S, GET_TEXT(LABEL), ACTION)
+#define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION)
+#define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION)
+#define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION)
+#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION)
+
+#define GCODES_ITEM_N_S_P(N, S, PLABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, PLABEL, GCODES)
+#define GCODES_ITEM_N_S(N, S, LABEL, GCODES) GCODES_ITEM_N_S_P(N, S, GET_TEXT(LABEL), GCODES)
+#define GCODES_ITEM_S_P(S, PLABEL, GCODES) MENU_ITEM_S_P(gcode, S, PLABEL, GCODES)
+#define GCODES_ITEM_S(S, LABEL, GCODES) GCODES_ITEM_S_P(S, GET_TEXT(LABEL), GCODES)
+#define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES)
+#define GCODES_ITEM_N(N, LABEL, GCODES) GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES)
+#define GCODES_ITEM_P(PLABEL, GCODES) MENU_ITEM_P(gcode, PLABEL, GCODES)
+#define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES)
+
+#define SUBMENU_N_S_P(N, S, PLABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, PLABEL, DEST)
+#define SUBMENU_N_S(N, S, LABEL, DEST) SUBMENU_N_S_P(N, S, GET_TEXT(LABEL), DEST)
+#define SUBMENU_S_P(S, PLABEL, DEST) MENU_ITEM_S_P(submenu, S, PLABEL, DEST)
+#define SUBMENU_S(S, LABEL, DEST) SUBMENU_S_P(S, GET_TEXT(LABEL), DEST)
+#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST)
+#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST)
+#define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST)
+#define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST)
+
+#define EDIT_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, ##V)
+#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_S_P(TYPE, S, PLABEL, V...) MENU_ITEM_S_P(TYPE, S, PLABEL, ##V)
+#define EDIT_ITEM_S(TYPE, S, LABEL, V...) EDIT_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V)
+#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V)
+#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V)
+
+#define EDIT_ITEM_FAST_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V)
+#define EDIT_ITEM_FAST_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_FAST_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_FAST_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_S_P(TYPE, S, true, PLABEL, ##V)
+#define EDIT_ITEM_FAST_S(TYPE, S, LABEL, V...) EDIT_ITEM_FAST_S_P(TYPE, S, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V)
+#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V)
+#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V)
+
+#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \
+ if (encoderLine == _thisItemNr && ui.use_click()) { \
+ ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \
+ return; \
+ } \
+ if (ui.should_draw()) MenuItem_confirm::draw \
+ (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V); \
+}while(0)
-#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \
- if (encoderLine == _thisItemNr && ui.use_click()) { \
- ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \
- return; \
- } \
- if (ui.should_draw()) MenuItem_confirm::draw \
- (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V); \
+// Indexed items set a global index value and optional data
+#define _CONFIRM_ITEM_P(PLABEL, V...) do { \
+ _skipStatic = false; \
+ if (_menuLineNr == _thisItemNr) \
+ _CONFIRM_ITEM_INNER_P(PLABEL, ##V); \
+ NEXT_ITEM(); \
}while(0)
-#define _CONFIRM_ITEM_P(PLABEL, V...) do { \
+// Indexed items set a global index value
+#define _CONFIRM_ITEM_N_S_P(N, S, V...) do{ \
_skipStatic = false; \
- if (_menuLineNr == _thisItemNr) \
- _CONFIRM_ITEM_INNER_P(PLABEL, ##V); \
+ if (_menuLineNr == _thisItemNr) { \
+ MenuItemBase::init(N, S); \
+ _CONFIRM_ITEM_INNER_P(TYPE, ##V); \
+ } \
NEXT_ITEM(); \
}while(0)
// Indexed items set a global index value
-#define _CONFIRM_ITEM_N_P(N, V...) do{ \
- _skipStatic = false; \
- if (_menuLineNr == _thisItemNr) { \
- MenuItemBase::init(N); \
- _CONFIRM_ITEM_INNER_P(TYPE, ##V); \
- } \
- NEXT_ITEM(); \
-}while(0)
+#define _CONFIRM_ITEM_N_P(N, V...) _CONFIRM_ITEM_N_S_P(N, nullptr, V)
#define CONFIRM_ITEM_P(PLABEL,A,B,V...) _CONFIRM_ITEM_P(PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
#define CONFIRM_ITEM(LABEL, V...) CONFIRM_ITEM_P(GET_TEXT(LABEL), ##V)
@@ -530,11 +574,15 @@ class MenuItem_bool : public MenuEditItemBase {
#define YESNO_ITEM_P(PLABEL, V...) _CONFIRM_ITEM_P(PLABEL, ##V)
#define YESNO_ITEM(LABEL, V...) YESNO_ITEM_P(GET_TEXT(LABEL), ##V)
-#define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...) _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
-#define CONFIRM_ITEM_N(N,LABEL, V...) CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
+#define CONFIRM_ITEM_N_S_P(N,S,PLABEL,A,B,V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
+#define CONFIRM_ITEM_N_S(N,S,LABEL,V...) CONFIRM_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
+#define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...) _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
+#define CONFIRM_ITEM_N(N,LABEL, V...) CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
-#define YESNO_ITEM_N_P(N,PLABEL, V...) _CONFIRM_ITEM_N_P(N, PLABEL, ##V)
-#define YESNO_ITEM_N(N,LABEL, V...) YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_N_S_P(N,S,PLABEL, V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, ##V)
+#define YESNO_ITEM_N_S(N,S,LABEL, V...) YESNO_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_N_P(N,PLABEL, V...) _CONFIRM_ITEM_N_P(N, PLABEL, ##V)
+#define YESNO_ITEM_N(N,LABEL, V...) YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
////////////////////////////////////////////
/////////////// Menu Screens ///////////////
diff --git a/Marlin/src/lcd/menu/menu_addon.h b/Marlin/src/lcd/menu/menu_addon.h
index 5f338c571a..e66a19409f 100644
--- a/Marlin/src/lcd/menu/menu_addon.h
+++ b/Marlin/src/lcd/menu/menu_addon.h
@@ -22,9 +22,6 @@
#pragma once
#include "../lcdprint.h"
-#if HAS_GRAPHICAL_LCD
- #include "../dogm/ultralcd_DOGM.h"
-#endif
#define MENU_ITEM_ADDON_START(X) do{ \
if (ui.should_draw() && _menuLineNr == _thisItemNr - 1) { \
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 0bd1c1e655..e87158fbd0 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -300,11 +300,12 @@ void menu_advanced_settings();
#if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS)
- void _menu_configuration_preheat_settings(const uint8_t m) {
+ void _menu_configuration_preheat_settings() {
#define _MINTEMP_ITEM(N) HEATER_##N##_MINTEMP,
#define _MAXTEMP_ITEM(N) HEATER_##N##_MAXTEMP,
#define MINTEMP_ALL _MIN(REPEAT(HOTENDS, _MINTEMP_ITEM) 999)
#define MAXTEMP_ALL _MAX(REPEAT(HOTENDS, _MAXTEMP_ITEM) 0)
+ const uint8_t m = MenuItemBase::itemIndex;
START_MENU();
BACK_ITEM(MSG_CONFIGURATION);
#if HAS_FAN
@@ -323,18 +324,6 @@ void menu_advanced_settings();
END_MENU();
}
- void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(0); }
- void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); }
- #if PREHEAT_COUNT >= 3
- void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3); }
- #if PREHEAT_COUNT >= 4
- void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4); }
- #if PREHEAT_COUNT >= 5
- void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5); }
- #endif
- #endif
- #endif
-
#endif
void menu_configuration() {
@@ -414,17 +403,8 @@ void menu_configuration() {
// Preheat configurations
#if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS)
- SUBMENU(MSG_PREHEAT_1_SETTINGS, menu_preheat_material1_settings);
- SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings);
- #if PREHEAT_COUNT >= 3
- SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings);
- #if PREHEAT_COUNT >= 4
- SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings);
- #if PREHEAT_COUNT >= 5
- SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings);
- #endif
- #endif
- #endif
+ LOOP_L_N(m, PREHEAT_COUNT)
+ SUBMENU_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings);
#endif
#if ENABLED(EEPROM_SETTINGS)
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 1c7abba6d4..90639c3af5 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -55,13 +55,21 @@ inline PGM_P _change_filament_command() {
}
// Initiate Filament Load/Unload/Change at the specified temperature
-static void _change_filament(const uint16_t celsius) {
+static void _change_filament_with_temp(const uint16_t celsius) {
char cmd[11];
sprintf_P(cmd, _change_filament_command(), _change_filament_extruder);
thermalManager.setTargetHotend(celsius, _change_filament_extruder);
queue.inject(cmd);
}
+static void _change_filament_with_preset() {
+ _change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp);
+}
+
+static void _change_filament_with_custom() {
+ _change_filament_with_temp(thermalManager.temp_hotend[MenuItemBase::itemIndex].target);
+}
+
//
// Menu to choose the temperature and start Filament Change
//
@@ -81,11 +89,14 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
START_MENU();
if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_CENTER|SS_INVERT);
BACK_ITEM(MSG_BACK);
- ACTION_ITEM(MSG_PREHEAT_1, []{ _change_filament(ui.material_preset[0].hotend_temp); });
- ACTION_ITEM(MSG_PREHEAT_2, []{ _change_filament(ui.material_preset[1].hotend_temp); });
- EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_extruder].target, EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT, []{
- _change_filament(thermalManager.temp_hotend[_change_filament_extruder].target);
- });
+ #if PREHEAT_COUNT
+ LOOP_L_N(m, PREHEAT_COUNT)
+ ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
+ #endif
+ EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target,
+ EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT,
+ _change_filament_with_custom
+ );
END_MENU();
}
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index a94e790627..46f48e22fa 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -66,95 +66,76 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i
ui.return_to_status();
}
-#if HAS_TEMP_HOTEND
- inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
+#if PREHEAT_COUNT
+
+ #if HAS_TEMP_HOTEND
+ inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
+ #if HAS_HEATED_BED
+ inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); }
+ #endif
+ #endif
#if HAS_HEATED_BED
- inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); }
+ inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); }
#endif
-#endif
-#if HAS_HEATED_BED
- inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); }
-#endif
-
-#if HAS_TEMP_HOTEND || HAS_HEATED_BED
#if HAS_TEMP_HOTEND && HAS_HEATED_BED
// Indexed "Preheat ABC" and "Heat Bed" items
#define PREHEAT_ITEMS(M,E) do{ \
- ACTION_ITEM_N_P(E, msg_preheat_h[M], []{ _preheat_both(M, MenuItemBase::itemIndex); }); \
- ACTION_ITEM_N_P(E, msg_preheat_end_e[M], []{ _preheat_end(M, MenuItemBase::itemIndex); }); \
+ ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_both(M, MenuItemBase::itemIndex); }); \
+ ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_END_E, []{ _preheat_end(M, MenuItemBase::itemIndex); }); \
}while(0)
#elif HAS_MULTI_HOTEND
// No heated bed, so just indexed "Preheat ABC" items
- #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_P(E, msg_preheat_h[M], []{ _preheat_end(M, MenuItemBase::itemIndex); })
+ #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_end(M, MenuItemBase::itemIndex); })
#endif
- void menu_preheat_m(const uint8_t m) {
+ void do_preheat_end_m() { _preheat_end(editable.int8, 0); }
- #if HOTENDS == 1
- PGM_P msg_preheat[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1), GET_TEXT(MSG_PREHEAT_2), GET_TEXT(MSG_PREHEAT_3), GET_TEXT(MSG_PREHEAT_4), GET_TEXT(MSG_PREHEAT_5));
- #if HAS_HEATED_BED
- PGM_P msg_preheat_end[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_END), GET_TEXT(MSG_PREHEAT_2_END), GET_TEXT(MSG_PREHEAT_3_END), GET_TEXT(MSG_PREHEAT_4_END), GET_TEXT(MSG_PREHEAT_5_END));
- #endif
- #elif HAS_MULTI_HOTEND
- PGM_P msg_preheat_all[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_ALL), GET_TEXT(MSG_PREHEAT_2_ALL), GET_TEXT(MSG_PREHEAT_3_ALL), GET_TEXT(MSG_PREHEAT_4_ALL), GET_TEXT(MSG_PREHEAT_5_ALL));
- #endif
+ #if HAS_MULTI_HOTEND || HAS_HEATED_BED
- #if HAS_TEMP_HOTEND && HAS_HEATED_BED && HAS_MULTI_HOTEND
- PGM_P msg_preheat_end_e[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_END_E), GET_TEXT(MSG_PREHEAT_2_END_E), GET_TEXT(MSG_PREHEAT_3_END_E), GET_TEXT(MSG_PREHEAT_4_END_E), GET_TEXT(MSG_PREHEAT_5_END_E));
- #endif
+ // Set editable.int8 to the Material index before entering this menu
+ // because MenuItemBase::itemIndex will be re-used by PREHEAT_ITEMS
+ void menu_preheat_m() {
+ const uint8_t m = editable.int8; // Don't re-use 'editable' in this menu
- #if HAS_MULTI_HOTEND
- PGM_P msg_preheat_h[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_H), GET_TEXT(MSG_PREHEAT_2_H), GET_TEXT(MSG_PREHEAT_3_H), GET_TEXT(MSG_PREHEAT_4_H), GET_TEXT(MSG_PREHEAT_5_H));
- #endif
+ START_MENU();
+ BACK_ITEM(MSG_TEMPERATURE);
- MenuItemBase::itemIndex = m;
+ #if HOTENDS == 1
- START_MENU();
- BACK_ITEM(MSG_TEMPERATURE);
+ #if HAS_HEATED_BED
+ ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, []{ _preheat_both(editable.int8, 0); });
+ ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_END, do_preheat_end_m);
+ #else
+ ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
+ #endif
- #if HOTENDS == 1
+ #elif HAS_MULTI_HOTEND
- #if HAS_HEATED_BED
- ACTION_ITEM_P(msg_preheat[m], []{ _preheat_both(MenuItemBase::itemIndex, 0); });
- ACTION_ITEM_P(msg_preheat_end[m], []{ _preheat_end(MenuItemBase::itemIndex, 0); });
- #else
- ACTION_ITEM_P(msg_preheat[m], []{ _preheat_end(MenuItemBase::itemIndex, 0); });
- #endif
+ HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e);
+ ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() {
+ TERN_(HAS_HEATED_BED, []{ _preheat_bed(editable.int8); });
+ HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[editable.int8].hotend_temp, e);
+ });
- #elif HAS_MULTI_HOTEND
+ #endif
- LOOP_S_L_N(n, 0, HOTENDS) PREHEAT_ITEMS(MenuItemBase::itemIndex, n);
- ACTION_ITEM_P(msg_preheat_all[m], []() {
- TERN_(HAS_HEATED_BED, _preheat_bed(MenuItemBase::itemIndex));
- HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[MenuItemBase::itemIndex].hotend_temp, e);
- });
+ #if HAS_HEATED_BED
+ ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_BEDONLY, []{ _preheat_bed(editable.int8); });
+ #endif
- #endif
+ END_MENU();
+ }
- #if HAS_HEATED_BED
- PGM_P msg_preheat_bed[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_BEDONLY), GET_TEXT(MSG_PREHEAT_2_BEDONLY), GET_TEXT(MSG_PREHEAT_3_BEDONLY), GET_TEXT(MSG_PREHEAT_4_BEDONLY), GET_TEXT(MSG_PREHEAT_5_BEDONLY));
- ACTION_ITEM_P(msg_preheat_bed[m], []{ _preheat_bed(MenuItemBase::itemIndex); });
- #endif
+ #endif // HAS_MULTI_HOTEND || HAS_HEATED_BED
- END_MENU();
- }
+#endif // PREHEAT_COUNT
- void menu_preheat_m1() { menu_preheat_m(0); }
- void menu_preheat_m2() { menu_preheat_m(1); }
- #if PREHEAT_COUNT >= 3
- void menu_preheat_m3() { menu_preheat_m(2); }
- #if PREHEAT_COUNT >= 4
- void menu_preheat_m4() { menu_preheat_m(3); }
- #if PREHEAT_COUNT >= 5
- void menu_preheat_m5() { menu_preheat_m(4); }
- #endif
- #endif
- #endif
+#if HAS_TEMP_HOTEND || HAS_HEATED_BED
void lcd_cooldown() {
thermalManager.zero_fan_speeds();
@@ -165,9 +146,11 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i
#endif // HAS_TEMP_HOTEND || HAS_HEATED_BED
void menu_temperature() {
- #if HAS_TEMP_HOTEND
+ #if HAS_TEMP_HOTEND || HAS_HEATED_BED
bool has_heat = false;
- HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
+ #if HAS_TEMP_HOTEND
+ HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
+ #endif
#endif
START_MENU();
@@ -279,44 +262,27 @@ void menu_temperature() {
#endif // HAS_FAN
- #if HAS_TEMP_HOTEND
-
+ #if PREHEAT_COUNT
//
- // Preheat for Material 1 and 2
+ // Preheat for Materials 1 to 5
//
- #if HOTENDS > 1 || HAS_HEATED_BED
- SUBMENU(MSG_PREHEAT_1, menu_preheat_m1);
- SUBMENU(MSG_PREHEAT_2, menu_preheat_m2);
- #if PREHEAT_COUNT >= 3
- SUBMENU(MSG_PREHEAT_3, menu_preheat_m3);
- #if PREHEAT_COUNT >= 4
- SUBMENU(MSG_PREHEAT_4, menu_preheat_m4);
- #if PREHEAT_COUNT >= 5
- SUBMENU(MSG_PREHEAT_5, menu_preheat_m5);
- #endif
- #endif
- #endif
- #else
- ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); });
- ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); });
- #if PREHEAT_COUNT >= 3
- ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); });
- #if PREHEAT_COUNT >= 3
- ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); });
- #if PREHEAT_COUNT >= 3
- ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); });
- #endif
- #endif
+ LOOP_L_N(m, PREHEAT_COUNT) {
+ editable.int8 = m;
+ #if HOTENDS > 1 || HAS_HEATED_BED
+ SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
+ #else
+ ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
#endif
- #endif
+ }
+ #endif
+ #if HAS_TEMP_HOTEND || HAS_HEATED_BED
//
// Cooldown
//
if (TERN0(HAS_HEATED_BED, thermalManager.temp_bed.target)) has_heat = true;
if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown);
-
- #endif // HAS_TEMP_HOTEND
+ #endif
END_MENU();
}
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 3722b53cb9..3eeee14d4d 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -196,21 +196,36 @@ void _lcd_ubl_edit_mesh() {
* UBL Validate Mesh submenu
*
* << UBL Tools
- * Mesh Validation with Material 1
- * Mesh Validation with Material 2
+ * Mesh Validation with Material 1 up to 5
* Validate Custom Mesh
* << Info Screen
*/
void _lcd_ubl_validate_mesh() {
START_MENU();
BACK_ITEM(MSG_UBL_TOOLS);
- #if HAS_HEATED_BED
- GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
- GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
- #else
- GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
- GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
- #endif
+ #if PREHEAT_COUNT
+ #if HAS_HEATED_BED
+ #define VALIDATE_MESH_GCODE_ITEM(M) \
+ GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26 C P I" STRINGIFY(M)))
+ #else
+ #define VALIDATE_MESH_GCODE_ITEM(M) \
+ GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26 C P B0 I" STRINGIFY(M)))
+ #endif
+
+ VALIDATE_MESH_GCODE_ITEM(0);
+ #if PREHEAT_COUNT > 1
+ VALIDATE_MESH_GCODE_ITEM(1);
+ #if PREHEAT_COUNT > 2
+ VALIDATE_MESH_GCODE_ITEM(2);
+ #if PREHEAT_COUNT > 3
+ VALIDATE_MESH_GCODE_ITEM(3);
+ #if PREHEAT_COUNT > 4
+ VALIDATE_MESH_GCODE_ITEM(4);
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif // PREHEAT_COUNT
ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
@@ -292,8 +307,7 @@ void _lcd_ubl_invalidate() {
* UBL Build Mesh submenu
*
* << UBL Tools
- * Build Mesh with Material 1
- * Build Mesh with Material 2
+ * Build Mesh with Material 1 up to 5
* - Build Custom Mesh >>
* Build Cold Mesh
* - Fill-in Mesh >>
@@ -305,37 +319,36 @@ void _lcd_ubl_invalidate() {
void _lcd_ubl_build_mesh() {
START_MENU();
BACK_ITEM(MSG_UBL_TOOLS);
- #if HAS_HEATED_BED
- GCODES_ITEM(MSG_UBL_BUILD_MESH_M1, PSTR(
- "G28\n"
- "M190 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\n"
- "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n"
- "G29 P1\n"
- "M104 S0\n"
- "M140 S0"
- ));
- GCODES_ITEM(MSG_UBL_BUILD_MESH_M2, PSTR(
- "G28\n"
- "M190 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\n"
- "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n"
- "G29 P1\n"
- "M104 S0\n"
- "M140 S0"
- ));
- #else
- GCODES_ITEM(MSG_UBL_BUILD_MESH_M1, PSTR(
- "G28\n"
- "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n"
- "G29 P1\n"
- "M104 S0"
- ));
- GCODES_ITEM(MSG_UBL_BUILD_MESH_M2, PSTR(
- "G28\n"
- "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n"
- "G29 P1\n"
- "M104 S0"
- ));
- #endif
+ #if PREHEAT_COUNT
+ #if HAS_HEATED_BED
+ #define PREHEAT_BED_GCODE(M) "M190 I" STRINGIFY(M) "\n"
+ #else
+ #define PREHEAT_BED_GCODE(M) ""
+ #endif
+ #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_S(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \
+ PSTR( \
+ "G28\n" \
+ PREHEAT_BED_GCODE(M) \
+ "M109 I" STRINGIFY(M) "\n" \
+ "G29 P1\n" \
+ "M104 S0\n" \
+ "M140 S0" \
+ ) )
+ BUILD_MESH_GCODE_ITEM(0);
+ #if PREHEAT_COUNT > 1
+ BUILD_MESH_GCODE_ITEM(1);
+ #if PREHEAT_COUNT > 2
+ BUILD_MESH_GCODE_ITEM(2);
+ #if PREHEAT_COUNT > 3
+ BUILD_MESH_GCODE_ITEM(3);
+ #if PREHEAT_COUNT > 4
+ BUILD_MESH_GCODE_ITEM(4);
+ #endif
+ #endif
+ #endif
+ #endif
+ #endif // PREHEAT_COUNT
+
SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1"));
SUBMENU(MSG_UBL_FILLIN_MESH, _menu_ubl_fillin);
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index d2033018a6..1848a56d2c 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -86,10 +86,6 @@ MarlinUI ui;
}
#endif
-#if PREHEAT_COUNT
- preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load()
-#endif
-
#if HAS_SPI_LCD
#if HAS_GRAPHICAL_LCD
@@ -153,6 +149,33 @@ millis_t MarlinUI::next_button_update_ms; // = 0
volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
#endif
+#if PREHEAT_COUNT
+ preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load()
+
+ PGM_P MarlinUI::get_preheat_label(const uint8_t m) {
+ #ifdef PREHEAT_1_LABEL
+ static PGMSTR(preheat_0_label, PREHEAT_1_LABEL);
+ #endif
+ #ifdef PREHEAT_2_LABEL
+ static PGMSTR(preheat_1_label, PREHEAT_2_LABEL);
+ #endif
+ #ifdef PREHEAT_3_LABEL
+ static PGMSTR(preheat_2_label, PREHEAT_3_LABEL);
+ #endif
+ #ifdef PREHEAT_4_LABEL
+ static PGMSTR(preheat_3_label, PREHEAT_4_LABEL);
+ #endif
+ #ifdef PREHEAT_5_LABEL
+ static PGMSTR(preheat_4_label, PREHEAT_5_LABEL);
+ #endif
+
+ #define _PLBL(N) preheat_##N##_label,
+ static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = { REPEAT(PREHEAT_COUNT, _PLBL) };
+
+ return (PGM_P)pgm_read_ptr(&preheat_labels[m]);
+ }
+#endif
+
#if ENABLED(SDSUPPORT)
#include "../sd/cardreader.h"
diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h
index 6ebd43a37d..2b9efab359 100644
--- a/Marlin/src/lcd/ultralcd.h
+++ b/Marlin/src/lcd/ultralcd.h
@@ -78,14 +78,6 @@
#if HAS_LCD_MENU
- #if HAS_GRAPHICAL_LCD
- #define SETCURSOR(col, row) lcd_moveto(col * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT))
- #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT))
- #else
- #define SETCURSOR(col, row) lcd_moveto(col, row)
- #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_WIDTH - (len), row)
- #endif
-
#include "lcdprint.h"
void _wrap_string(uint8_t &col, uint8_t &row, const char * const string, read_byte_cb_t cb_read_byte, const bool wordwrap=false);
@@ -505,6 +497,7 @@ public:
#if PREHEAT_COUNT
static preheat_t material_preset[PREHEAT_COUNT];
+ static PGM_P get_preheat_label(const uint8_t m);
#endif
#if HAS_LCD_MENU
--
GitLab