diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 6c86cf139045240313279e7c8da8c60427f228f9..563202a8e2b590403cfdba45d3e95746ad228409 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -169,6 +169,8 @@
#define MSG_ERR_M428_TOO_FAR "Too far from reference point"
#define MSG_ERR_M303_DISABLED "PIDTEMP disabled"
#define MSG_M119_REPORT "Reporting endstop status"
+#define MSG_ON "ON"
+#define MSG_OFF "OFF"
#define MSG_ENDSTOP_HIT "TRIGGERED"
#define MSG_ENDSTOP_OPEN "open"
#define MSG_HOTEND_OFFSET "Hotend offsets:"
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 9b89644f02adcb3df3e08ff2a043f16bc40ea5df..d55e27015b21536b5fae8a5d5d036f1b6f00e66a 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -21,6 +21,7 @@
*/
#include "serial.h"
+#include "language.h"
uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
@@ -52,6 +53,9 @@ void serialprintPGM(PGM_P str) {
while (char ch = pgm_read_byte(str++)) SERIAL_CHAR(ch);
}
+void serial_echo_start() { serialprintPGM(echomagic); }
+void serial_error_start() { serialprintPGM(errormagic); }
+
void serial_echopair_PGM(PGM_P s_P, const char *v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
void serial_echopair_PGM(PGM_P s_P, char v) { serialprintPGM(s_P); SERIAL_CHAR(v); }
void serial_echopair_PGM(PGM_P s_P, int v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
@@ -63,8 +67,8 @@ void serial_echopair_PGM(PGM_P s_P, unsigned long v) { serialprintPGM(s_P); SERI
void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
-void serial_echo_start() { serialprintPGM(echomagic); }
-void serial_error_start() { serialprintPGM(errormagic); }
+void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(MSG_ON) : PSTR(MSG_OFF)); }
+void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EOL(); }
#if ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 7c41d6a75a13a74b43f4453a5eae21836af0d2a9..49b7e21b2ec27468f6c5527a4f5647ed0148cb52 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -238,6 +238,8 @@ void serial_spaces(uint8_t count);
void serialprintPGM(PGM_P str);
void serial_echo_start();
void serial_error_start();
+void serialprint_onoff(const bool onoff);
+void serialprintln_onoff(const bool onoff);
#if ENABLED(DEBUG_LEVELING_FEATURE)
void print_xyz(PGM_P prefix, PGM_P suffix, const float x, const float y, const float z);
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 7fed4f99966fb11fa2bb878d8327d270a74f3c88..b881a21c89c5ebc63190e713ae71fbf30d052a27 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -212,7 +212,8 @@ void GcodeSuite::M420() {
}
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR("Bed Leveling ", planner.leveling_active ? MSG_ON : MSG_OFF);
+ SERIAL_ECHOPGM("Bed Leveling ")
+ serialprintln_onoff(planner.leveling_active);
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
SERIAL_ECHO_START();
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 5bcc9e069acc9ffad60e283f6ea37d75b1fdf061..2f26f1cc86a9df99e8667d0c80e25d530bfc960c 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -80,7 +80,8 @@ void GcodeSuite::G29() {
switch (state) {
case MeshReport:
if (leveling_is_valid()) {
- SERIAL_PROTOCOLLNPAIR("State: ", planner.leveling_active ? MSG_ON : MSG_OFF);
+ SERIAL_PROTOCOLPGM("State: ");
+ serialprintln_onoff(planner.leveling_active);
mbl.report_mesh();
}
else
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index 4b06ce9fbe2c3dd9560097fdbd91ca9ced8d0685..83db00a3bd2726930e3b070a031b3094c81f4a91 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -35,12 +35,8 @@
void GcodeSuite::M211() {
SERIAL_ECHO_START();
SERIAL_ECHOPGM(MSG_SOFT_ENDSTOPS);
- #if HAS_SOFTWARE_ENDSTOPS
- if (parser.seen('S')) soft_endstops_enabled = parser.value_bool();
- serialprintPGM(soft_endstops_enabled ? PSTR(MSG_ON) : PSTR(MSG_OFF));
- #else
- SERIAL_ECHOPGM(MSG_OFF);
- #endif
+ if (parser.seen('S')) soft_endstops_enabled = parser.value_bool();
+ serialprint_onoff(soft_endstops_enabled);
SERIAL_ECHOPGM(MSG_SOFT_MIN);
SERIAL_ECHOPAIR( MSG_X, LOGICAL_X_POSITION(soft_endstop_min[X_AXIS]));
SERIAL_ECHOPAIR(" " MSG_Y, LOGICAL_Y_POSITION(soft_endstop_min[Y_AXIS]));
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 3530881f50b5d32dc86b8aa971caa5705efc7f70..bcd0cf7b769a7e9ca324de548cd3ccda118e908d 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -153,7 +153,8 @@
planner.synchronize();
extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
SERIAL_ECHO_START();
- SERIAL_ECHOLNPAIR(MSG_DUPLICATION_MODE, extruder_duplication_enabled ? MSG_ON : MSG_OFF);
+ SERIAL_ECHOPGM(MSG_DUPLICATION_MODE);
+ serialprintln_onoff(extruder_duplication_enabled);
}
#endif // DUAL_NOZZLE_DUPLICATION_MODE
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index d3e91927e06ab7ec90e4c119bca0bf24ba8f8f52..849f30f9b9ae3c3d5cb570b6713b40f34752f5a2 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -87,8 +87,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Temperatura Auto.")
-#define MSG_ON _UxGT("On")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index f7471675c7d73f1cda0c44eb92dece67bfb415ad..3409e770d526373b92e57c342effe7d1a6a66621 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -77,8 +77,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Максимум")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Фактор")
#define MSG_AUTOTEMP _UxGT("Авто-темп.")
-#define MSG_ON _UxGT("Вкл. ")
-#define MSG_OFF _UxGT("Изкл. ")
+#define MSG_LCD_ON _UxGT("Вкл.")
+#define MSG_LCD_OFF _UxGT("Изкл.")
#define MSG_A_RETRACT _UxGT("A-откат")
#define MSG_A_TRAVEL _UxGT("A-travel")
#define MSG_STEPS_PER_MM _UxGT("Стъпки/mm")
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 3826cb6c3d136bfe04e6c230bc5d7e5ac033626d..c871bdee0a9665c6430d2d8e0bc64f80c8f41faf 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -91,8 +91,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index ba4a707bfe2eb3efe9506ee676915ee6f84b85db..a3514ac7434fd6c1b0d3bf02f01bfac44d895083 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -189,8 +189,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fakt")
#define MSG_AUTOTEMP _UxGT("Autoteplota")
-#define MSG_ON _UxGT("Zap")
-#define MSG_OFF _UxGT("Vyp")
+#define MSG_LCD_ON _UxGT("Zap")
+#define MSG_LCD_OFF _UxGT("Vyp")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 2b489618f4f6c255271ec3897ecdb3597509edf7..2dcea9ee4b3909b45873da3f6e786ec7279a5e3e 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -88,8 +88,8 @@
#define MSG_MAX _UxGT(" \002 Max")
#define MSG_FACTOR _UxGT(" \002 Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("Til ")
-#define MSG_OFF _UxGT("Fra")
+#define MSG_LCD_ON _UxGT("Til")
+#define MSG_LCD_OFF _UxGT("Fra")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 5ce8c498dc80d554767e59bda345f449288f96b3..e0e24462c7b61a8e38b40b730f799324ee3b7c4c 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -201,8 +201,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Faktor")
#define MSG_AUTOTEMP _UxGT("Auto Temperatur")
-#define MSG_ON _UxGT("Ein")
-#define MSG_OFF _UxGT("Aus")
+#define MSG_LCD_ON _UxGT("Ein")
+#define MSG_LCD_OFF _UxGT("Aus")
#define MSG_PID_P _UxGT("PID P")
#define MSG_PID_I _UxGT("PID I")
#define MSG_PID_D _UxGT("PID D")
diff --git a/Marlin/src/lcd/language/language_el-gr.h b/Marlin/src/lcd/language/language_el-gr.h
index fc5d642bc0e1fc3ca0194eb641616589d0f94681..85c2b82114316d23f75b00200fa48beaf55ef1a4 100644
--- a/Marlin/src/lcd/language/language_el-gr.h
+++ b/Marlin/src/lcd/language/language_el-gr.h
@@ -87,8 +87,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Αυτομ. ρύθμιση θερμοκρασίας")
-#define MSG_ON _UxGT("Ενεργοποιημένο")
-#define MSG_OFF _UxGT("Απενεργοποιημένο")
+#define MSG_LCD_ON _UxGT("Ενεργοποιημένο")
+#define MSG_LCD_OFF _UxGT("Απενεργοποιημένο")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index c7ab0b28b8b5a5ff73c515e6bb493516bbee4b47..38ae18cbfaa295d14e1fc6a0c55f3b5f4c9954a1 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -87,8 +87,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Αυτομ ρύθμιση θερ/σίας") //SHORTEN
-#define MSG_ON _UxGT("Ενεργοποιημένο")
-#define MSG_OFF _UxGT("Απενεργοποιημένο")
+#define MSG_LCD_ON _UxGT("Ενεργοποιημένο")
+#define MSG_LCD_OFF _UxGT("Απενεργοποιημένο")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index b138d5c42c368c95a29b88d1d9862c312405c482..764a0b8546f90f2a61302d20aac66275bfca47ba 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -540,10 +540,10 @@
#define MSG_AUTOTEMP _UxGT("Autotemp")
#endif
#ifndef MSG_ON
- #define MSG_ON _UxGT("On ")
+ #define MSG_LCD_ON _UxGT("On")
#endif
#ifndef MSG_OFF
- #define MSG_OFF _UxGT("Off")
+ #define MSG_LCD_OFF _UxGT("Off")
#endif
#ifndef MSG_PID_P
#define MSG_PID_P _UxGT("PID-P")
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index c7c193580cf8cba88a46ecc010795c0f9244c99b..f216db91bf8251a5521173eecf8b6983183ec8eb 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -95,8 +95,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Temperatura Auto.")
-#define MSG_ON _UxGT("Encender")
-#define MSG_OFF _UxGT("Apagar")
+#define MSG_LCD_ON _UxGT("Encender")
+#define MSG_LCD_OFF _UxGT("Apagar")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 2acbb6a8d3679c2071b29ed2ec30c0638632f422..a1771d91786e99cbc9fdda042b0f72196783c8ce 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -182,8 +182,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fakt")
#define MSG_AUTOTEMP _UxGT("Auto tenperatura")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 6155a4e9fe8b7e16073b902e4ea9dd0d4922241f..cca996d13cccd8a273817f7e8b6ce510a606e280 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -79,8 +79,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Kerr")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 5ddc58cf8045b51bcfc5b5b73dc6ba54ca16fbb1..386f7cedf41a3288603c3bfd402c85f9310664aa 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -184,8 +184,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Facteur")
#define MSG_AUTOTEMP _UxGT("Temp. Auto.")
-#define MSG_ON _UxGT("Marche ")
-#define MSG_OFF _UxGT("Arrêt")
+#define MSG_LCD_ON _UxGT("Marche")
+#define MSG_LCD_OFF _UxGT("Arrêt")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index ba9382ac46e8a18b7e68b3a4a4096c7f1e899f57..6809a2c70ca6a13f8b0c6a7ac95d45b8f76d4f23 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -87,8 +87,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index e3f60c58eaa4798a4ab7f7855c14353b0489dcb4..50893a0c828e08ea4ddeb421af7c73916837b1c8 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -87,8 +87,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 78044ed39b21e4f2f760e2d6935a9e73379a32ac..a380952fd923bdb0d8461fbe6f014d2107c6113b 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -199,8 +199,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_jp-kana.h b/Marlin/src/lcd/language/language_jp-kana.h
index a297ba90280a337085fb0b2af2102896729a74ea..b95285a85fded646818be1531e182f49db8ad932 100644
--- a/Marlin/src/lcd/language/language_jp-kana.h
+++ b/Marlin/src/lcd/language/language_jp-kana.h
@@ -97,8 +97,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" サイコウ") // " Max"
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" ファクター") // " Fact"
#define MSG_AUTOTEMP _UxGT("ジドウオンドセイギョ") // "Autotemp"
-#define MSG_ON _UxGT("オン ") // "On "
-#define MSG_OFF _UxGT("オフ ") // "Off"
+#define MSG_LCD_ON _UxGT("オン") // "On"
+#define MSG_LCD_OFF _UxGT("オフ") // "Off"
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index b5296809a25af363640a750b3f95ccec3d8ae966..aee4b4962a493787504681323ca07a5c87b13ea3 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -194,8 +194,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index cfe17216eafd00bddaffc970878f77877358ce02..1ab6d06836c3d036e210230fa7a49485a231de73 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -95,8 +95,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
-#define MSG_ON _UxGT("Aan ")
-#define MSG_OFF _UxGT("Uit")
+#define MSG_LCD_ON _UxGT("Aan")
+#define MSG_LCD_OFF _UxGT("Uit")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index a724fd74d31d019f4089a9fdc5177011e5c4d6cb..63cf3cd33b27400c3797988f6cb67fcff31ff47e 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -85,8 +85,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Mnożnik")
#define MSG_AUTOTEMP _UxGT("Auto. temperatura")
-#define MSG_ON _UxGT("Wł. ")
-#define MSG_OFF _UxGT("Wył.")
+#define MSG_LCD_ON _UxGT("Wł.")
+#define MSG_LCD_OFF _UxGT("Wył.")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_pt-br.h b/Marlin/src/lcd/language/language_pt-br.h
index db28aac5369fef25c2847974472fd6ad04037b2c..eb064b0d7d8f5e91758594f4e4fa9104ea1ac8a2 100644
--- a/Marlin/src/lcd/language/language_pt-br.h
+++ b/Marlin/src/lcd/language/language_pt-br.h
@@ -186,8 +186,8 @@
#define MSG_MAX LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR LCD_STR_THERMOMETER _UxGT(" Fator")
#define MSG_AUTOTEMP _UxGT("Temp. Automática")
-#define MSG_ON _UxGT("Ligado ")
-#define MSG_OFF _UxGT("Desligado")
+#define MSG_LCD_ON _UxGT("Ligado")
+#define MSG_LCD_OFF _UxGT("Desligado")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 36f5ebc2a81314cafcde35143290094cb4b596ae..954e6eb458b56c1fe5e1410094eebc0cf16c9a35 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -85,8 +85,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Temp. Automática")
-#define MSG_ON _UxGT("On ")
-#define MSG_OFF _UxGT("Off")
+#define MSG_LCD_ON _UxGT("On")
+#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 11772ac02e0f26364eb570f30013d039911cad88..9a3761b0cb3d2638c1c98e07b6c7a4c90af07860 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -184,8 +184,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Макс")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Фактор")
#define MSG_AUTOTEMP _UxGT("Автотемпература")
-#define MSG_ON _UxGT("Вкл.")
-#define MSG_OFF _UxGT("Выкл.")
+#define MSG_LCD_ON _UxGT("Вкл.")
+#define MSG_LCD_OFF _UxGT("Выкл.")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 2610d7b1807fe4075262fcbaa3e35f6dd4d4a7cb..1d133918a79f20dadcacf5acc7e2a7767eaa2c72 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -211,8 +211,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fakt")
#define MSG_AUTOTEMP _UxGT("Auto-teplota")
-#define MSG_ON _UxGT("Zap")
-#define MSG_OFF _UxGT("Vyp")
+#define MSG_LCD_ON _UxGT("Zap")
+#define MSG_LCD_OFF _UxGT("Vyp")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 46e0805754373b2dac58619f39d8fd5bd59d4008..44b3232ea407256e72809819e87375076d4a698e 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -95,8 +95,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max") // Max
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Çarpan") // Çarpan
#define MSG_AUTOTEMP _UxGT("Autotemp") // Autotemp
-#define MSG_ON _UxGT("On ") // On
-#define MSG_OFF _UxGT("Off") // Off
+#define MSG_LCD_ON _UxGT("On") // On
+#define MSG_LCD_OFF _UxGT("Off") // Off
#define MSG_PID_P _UxGT("PID-P") // PID-P
#define MSG_PID_I _UxGT("PID-I") // PID-I
#define MSG_PID_D _UxGT("PID-D") // PID-D
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 8030f3da4476664994b3b628cb25aca9c48890f6..38d7642420c8ccb3981c4b02a8c441298b1801da 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -87,8 +87,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Макс")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Факт")
#define MSG_AUTOTEMP _UxGT("Автотемпер.")
-#define MSG_ON _UxGT("Увімк.")
-#define MSG_OFF _UxGT("Вимк. ")
+#define MSG_LCD_ON _UxGT("Увімк.")
+#define MSG_LCD_OFF _UxGT("Вимк.")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index fcdaecc861a4c59990bee99b08663d858c97991f..7eb9fa008f918dd3ea772d52e1e64ae17c62b28f 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -180,8 +180,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 最大") //" " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 因数") //" " LCD_STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP _UxGT("自动控温") //"Autotemp"
-#define MSG_ON _UxGT("开 ") //"On "
-#define MSG_OFF _UxGT("关 ") //"Off"
+#define MSG_LCD_ON _UxGT("开") //"On"
+#define MSG_LCD_OFF _UxGT("关") //"Off"
#define MSG_PID_P _UxGT("PID-P") //"PID-P"
#define MSG_PID_I _UxGT("PID-I") //"PID-I"
#define MSG_PID_D _UxGT("PID-D") //"PID-D"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 5f28b48d0b61a6f04f1a7aadfc6794df6c12d62b..d823ad4d6f0b1e81268291fe0e595492bd9c0c01 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -180,8 +180,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 最大") //" " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 系數") //" " LCD_STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP _UxGT("自動控溫") //"Autotemp"
-#define MSG_ON _UxGT("開 ") //"On "
-#define MSG_OFF _UxGT("關 ") //"Off"
+#define MSG_LCD_ON _UxGT("開") //"On"
+#define MSG_LCD_OFF _UxGT("關") //"Off"
#define MSG_PID_P _UxGT("PID-P") //"PID-P"
#define MSG_PID_I _UxGT("PID-I") //"PID-I"
#define MSG_PID_D _UxGT("PID-D") //"PID-D"
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index d54e0a831d3ea26220aae9fc4055f51d2c1459de..cc3d54e8bed5eee775213ec17eabeb819d854667 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -74,7 +74,7 @@ void draw_edit_screen(PGM_P const pstr, const char* const value=NULL);
#define draw_menu_item_setting_edit_generic(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, false)
#define draw_menu_item_setting_edit_generic_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true)
#define DRAWMENU_SETTING_EDIT_GENERIC(SRC) draw_menu_item_setting_edit_generic(sel, row, pstr, SRC)
- #define DRAW_BOOL_SETTING(sel, row, pstr, data) draw_menu_item_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
+ #define DRAW_BOOL_SETTING(sel, row, pstr, data) draw_menu_item_setting_edit_generic_P(sel, row, pstr, (*(data))?PSTR(MSG_LCD_ON):PSTR(MSG_LCD_OFF))
#if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(MESH_EDIT_GFX_OVERLAY)
void _lcd_zoffset_overlay_gfx(const float zvalue);
#endif
@@ -83,7 +83,7 @@ void draw_edit_screen(PGM_P const pstr, const char* const value=NULL);
void draw_menu_item_setting_edit_generic(const bool sel, const uint8_t row, const char* pstr, const char pre_char, const char* const data);
void draw_menu_item_setting_edit_generic_P(const bool sel, const uint8_t row, const char* pstr, const char pre_char, const char* const data);
#define DRAWMENU_SETTING_EDIT_GENERIC(SRC) draw_menu_item_setting_edit_generic(sel, row, pstr, '>', SRC)
- #define DRAW_BOOL_SETTING(sel, row, pstr, data) draw_menu_item_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
+ #define DRAW_BOOL_SETTING(sel, row, pstr, data) draw_menu_item_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_LCD_ON):PSTR(MSG_LCD_OFF))
#endif
#define draw_menu_item_submenu(sel, row, pstr, data) draw_menu_item_generic(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0])
#define draw_menu_item_gcode(sel, row, pstr, gcode) draw_menu_item_generic(sel, row, pstr, '>', ' ')