From 50af1d1e0874c787fcafc9cf71c6a8ef55b20643 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 12 Nov 2018 17:04:00 -0600 Subject: [PATCH] Differentiate translated On/Off from Serial ON/OFF --- Marlin/src/core/language.h | 2 ++ Marlin/src/core/serial.cpp | 8 ++++++-- Marlin/src/core/serial.h | 2 ++ Marlin/src/gcode/bedlevel/M420.cpp | 3 ++- Marlin/src/gcode/bedlevel/mbl/G29.cpp | 3 ++- Marlin/src/gcode/control/M211.cpp | 8 ++------ Marlin/src/gcode/control/M605.cpp | 3 ++- Marlin/src/lcd/language/language_an.h | 4 ++-- Marlin/src/lcd/language/language_bg.h | 4 ++-- Marlin/src/lcd/language/language_ca.h | 4 ++-- Marlin/src/lcd/language/language_cz.h | 4 ++-- Marlin/src/lcd/language/language_da.h | 4 ++-- Marlin/src/lcd/language/language_de.h | 4 ++-- Marlin/src/lcd/language/language_el-gr.h | 4 ++-- Marlin/src/lcd/language/language_el.h | 4 ++-- Marlin/src/lcd/language/language_en.h | 4 ++-- Marlin/src/lcd/language/language_es.h | 4 ++-- Marlin/src/lcd/language/language_eu.h | 4 ++-- Marlin/src/lcd/language/language_fi.h | 4 ++-- Marlin/src/lcd/language/language_fr.h | 4 ++-- Marlin/src/lcd/language/language_gl.h | 4 ++-- Marlin/src/lcd/language/language_hr.h | 4 ++-- Marlin/src/lcd/language/language_it.h | 4 ++-- Marlin/src/lcd/language/language_jp-kana.h | 4 ++-- Marlin/src/lcd/language/language_ko_KR.h | 4 ++-- Marlin/src/lcd/language/language_nl.h | 4 ++-- Marlin/src/lcd/language/language_pl.h | 4 ++-- Marlin/src/lcd/language/language_pt-br.h | 4 ++-- Marlin/src/lcd/language/language_pt.h | 4 ++-- Marlin/src/lcd/language/language_ru.h | 4 ++-- Marlin/src/lcd/language/language_sk.h | 4 ++-- Marlin/src/lcd/language/language_tr.h | 4 ++-- Marlin/src/lcd/language/language_uk.h | 4 ++-- Marlin/src/lcd/language/language_zh_CN.h | 4 ++-- Marlin/src/lcd/language/language_zh_TW.h | 4 ++-- Marlin/src/lcd/menu/menu.h | 4 ++-- 36 files changed, 76 insertions(+), 69 deletions(-) diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index 6c86cf1390..563202a8e2 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 9b89644f02..d55e27015b 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 7c41d6a75a..49b7e21b2e 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 7fed4f9996..b881a21c89 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 5bcc9e069a..2f26f1cc86 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 4b06ce9fbe..83db00a3bd 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 3530881f50..bcd0cf7b76 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 d3e91927e0..849f30f9b9 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 f7471675c7..3409e770d5 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 3826cb6c3d..c871bdee0a 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 ba4a707bfe..a3514ac743 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 2b489618f4..2dcea9ee4b 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 5ce8c498dc..e0e24462c7 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 fc5d642bc0..85c2b82114 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 c7ab0b28b8..38ae18cbfa 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 b138d5c42c..764a0b8546 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 c7c193580c..f216db91bf 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 2acbb6a8d3..a1771d9178 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 6155a4e9fe..cca996d13c 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 5ddc58cf80..386f7cedf4 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 ba9382ac46..6809a2c70c 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 e3f60c58ea..50893a0c82 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 78044ed39b..a380952fd9 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 a297ba9028..b95285a85f 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 b5296809a2..aee4b4962a 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 cfe17216ea..1ab6d06836 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 a724fd74d3..63cf3cd33b 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 db28aac536..eb064b0d7d 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 36f5ebc2a8..954e6eb458 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 11772ac02e..9a3761b0cb 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 2610d7b180..1d133918a7 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 46e0805754..44b3232ea4 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 8030f3da44..38d7642420 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 fcdaecc861..7eb9fa008f 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 5f28b48d0b..d823ad4d6f 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 d54e0a831d..cc3d54e8be 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, '>', ' ')