Browse Source

Differentiate translated On/Off from Serial ON/OFF

Scott Lahteine 5 years ago
parent
commit
50af1d1e08
36 changed files with 76 additions and 69 deletions
  1. 2
    0
      Marlin/src/core/language.h
  2. 6
    2
      Marlin/src/core/serial.cpp
  3. 2
    0
      Marlin/src/core/serial.h
  4. 2
    1
      Marlin/src/gcode/bedlevel/M420.cpp
  5. 2
    1
      Marlin/src/gcode/bedlevel/mbl/G29.cpp
  6. 2
    6
      Marlin/src/gcode/control/M211.cpp
  7. 2
    1
      Marlin/src/gcode/control/M605.cpp
  8. 2
    2
      Marlin/src/lcd/language/language_an.h
  9. 2
    2
      Marlin/src/lcd/language/language_bg.h
  10. 2
    2
      Marlin/src/lcd/language/language_ca.h
  11. 2
    2
      Marlin/src/lcd/language/language_cz.h
  12. 2
    2
      Marlin/src/lcd/language/language_da.h
  13. 2
    2
      Marlin/src/lcd/language/language_de.h
  14. 2
    2
      Marlin/src/lcd/language/language_el-gr.h
  15. 2
    2
      Marlin/src/lcd/language/language_el.h
  16. 2
    2
      Marlin/src/lcd/language/language_en.h
  17. 2
    2
      Marlin/src/lcd/language/language_es.h
  18. 2
    2
      Marlin/src/lcd/language/language_eu.h
  19. 2
    2
      Marlin/src/lcd/language/language_fi.h
  20. 2
    2
      Marlin/src/lcd/language/language_fr.h
  21. 2
    2
      Marlin/src/lcd/language/language_gl.h
  22. 2
    2
      Marlin/src/lcd/language/language_hr.h
  23. 2
    2
      Marlin/src/lcd/language/language_it.h
  24. 2
    2
      Marlin/src/lcd/language/language_jp-kana.h
  25. 2
    2
      Marlin/src/lcd/language/language_ko_KR.h
  26. 2
    2
      Marlin/src/lcd/language/language_nl.h
  27. 2
    2
      Marlin/src/lcd/language/language_pl.h
  28. 2
    2
      Marlin/src/lcd/language/language_pt-br.h
  29. 2
    2
      Marlin/src/lcd/language/language_pt.h
  30. 2
    2
      Marlin/src/lcd/language/language_ru.h
  31. 2
    2
      Marlin/src/lcd/language/language_sk.h
  32. 2
    2
      Marlin/src/lcd/language/language_tr.h
  33. 2
    2
      Marlin/src/lcd/language/language_uk.h
  34. 2
    2
      Marlin/src/lcd/language/language_zh_CN.h
  35. 2
    2
      Marlin/src/lcd/language/language_zh_TW.h
  36. 2
    2
      Marlin/src/lcd/menu/menu.h

+ 2
- 0
Marlin/src/core/language.h View File

@@ -169,6 +169,8 @@
169 169
 #define MSG_ERR_M428_TOO_FAR                "Too far from reference point"
170 170
 #define MSG_ERR_M303_DISABLED               "PIDTEMP disabled"
171 171
 #define MSG_M119_REPORT                     "Reporting endstop status"
172
+#define MSG_ON                              "ON"
173
+#define MSG_OFF                             "OFF"
172 174
 #define MSG_ENDSTOP_HIT                     "TRIGGERED"
173 175
 #define MSG_ENDSTOP_OPEN                    "open"
174 176
 #define MSG_HOTEND_OFFSET                   "Hotend offsets:"

+ 6
- 2
Marlin/src/core/serial.cpp View File

@@ -21,6 +21,7 @@
21 21
  */
22 22
 
23 23
 #include "serial.h"
24
+#include "language.h"
24 25
 
25 26
 uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
26 27
 
@@ -52,6 +53,9 @@ void serialprintPGM(PGM_P str) {
52 53
   while (char ch = pgm_read_byte(str++)) SERIAL_CHAR(ch);
53 54
 }
54 55
 
56
+void serial_echo_start()  { serialprintPGM(echomagic); }
57
+void serial_error_start() { serialprintPGM(errormagic); }
58
+
55 59
 void serial_echopair_PGM(PGM_P s_P, const char *v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
56 60
 void serial_echopair_PGM(PGM_P s_P, char v)          { serialprintPGM(s_P); SERIAL_CHAR(v); }
57 61
 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
63 67
 
64 68
 void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
65 69
 
66
-void serial_echo_start()  { serialprintPGM(echomagic); }
67
-void serial_error_start() { serialprintPGM(errormagic); }
70
+void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(MSG_ON) : PSTR(MSG_OFF)); }
71
+void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EOL(); }
68 72
 
69 73
 #if ENABLED(DEBUG_LEVELING_FEATURE)
70 74
 

+ 2
- 0
Marlin/src/core/serial.h View File

@@ -238,6 +238,8 @@ void serial_spaces(uint8_t count);
238 238
 void serialprintPGM(PGM_P str);
239 239
 void serial_echo_start();
240 240
 void serial_error_start();
241
+void serialprint_onoff(const bool onoff);
242
+void serialprintln_onoff(const bool onoff);
241 243
 
242 244
 #if ENABLED(DEBUG_LEVELING_FEATURE)
243 245
   void print_xyz(PGM_P prefix, PGM_P suffix, const float x, const float y, const float z);

+ 2
- 1
Marlin/src/gcode/bedlevel/M420.cpp View File

@@ -212,7 +212,8 @@ void GcodeSuite::M420() {
212 212
   }
213 213
 
214 214
   SERIAL_ECHO_START();
215
-  SERIAL_ECHOLNPAIR("Bed Leveling ", planner.leveling_active ? MSG_ON : MSG_OFF);
215
+  SERIAL_ECHOPGM("Bed Leveling ")
216
+  serialprintln_onoff(planner.leveling_active);
216 217
 
217 218
   #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
218 219
     SERIAL_ECHO_START();

+ 2
- 1
Marlin/src/gcode/bedlevel/mbl/G29.cpp View File

@@ -80,7 +80,8 @@ void GcodeSuite::G29() {
80 80
   switch (state) {
81 81
     case MeshReport:
82 82
       if (leveling_is_valid()) {
83
-        SERIAL_PROTOCOLLNPAIR("State: ", planner.leveling_active ? MSG_ON : MSG_OFF);
83
+        SERIAL_PROTOCOLPGM("State: ");
84
+        serialprintln_onoff(planner.leveling_active);
84 85
         mbl.report_mesh();
85 86
       }
86 87
       else

+ 2
- 6
Marlin/src/gcode/control/M211.cpp View File

@@ -35,12 +35,8 @@
35 35
 void GcodeSuite::M211() {
36 36
   SERIAL_ECHO_START();
37 37
   SERIAL_ECHOPGM(MSG_SOFT_ENDSTOPS);
38
-  #if HAS_SOFTWARE_ENDSTOPS
39
-    if (parser.seen('S')) soft_endstops_enabled = parser.value_bool();
40
-    serialprintPGM(soft_endstops_enabled ? PSTR(MSG_ON) : PSTR(MSG_OFF));
41
-  #else
42
-    SERIAL_ECHOPGM(MSG_OFF);
43
-  #endif
38
+  if (parser.seen('S')) soft_endstops_enabled = parser.value_bool();
39
+  serialprint_onoff(soft_endstops_enabled);
44 40
   SERIAL_ECHOPGM(MSG_SOFT_MIN);
45 41
   SERIAL_ECHOPAIR(    MSG_X, LOGICAL_X_POSITION(soft_endstop_min[X_AXIS]));
46 42
   SERIAL_ECHOPAIR(" " MSG_Y, LOGICAL_Y_POSITION(soft_endstop_min[Y_AXIS]));

+ 2
- 1
Marlin/src/gcode/control/M605.cpp View File

@@ -153,7 +153,8 @@
153 153
     planner.synchronize();
154 154
     extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
155 155
     SERIAL_ECHO_START();
156
-    SERIAL_ECHOLNPAIR(MSG_DUPLICATION_MODE, extruder_duplication_enabled ? MSG_ON : MSG_OFF);
156
+    SERIAL_ECHOPGM(MSG_DUPLICATION_MODE);
157
+    serialprintln_onoff(extruder_duplication_enabled);
157 158
   }
158 159
 
159 160
 #endif // DUAL_NOZZLE_DUPLICATION_MODE

+ 2
- 2
Marlin/src/lcd/language/language_an.h View File

@@ -87,8 +87,8 @@
87 87
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
88 88
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
89 89
 #define MSG_AUTOTEMP                        _UxGT("Temperatura Auto.")
90
-#define MSG_ON                              _UxGT("On")
91
-#define MSG_OFF                             _UxGT("Off")
90
+#define MSG_LCD_ON                          _UxGT("On")
91
+#define MSG_LCD_OFF                         _UxGT("Off")
92 92
 #define MSG_PID_P                           _UxGT("PID-P")
93 93
 #define MSG_PID_I                           _UxGT("PID-I")
94 94
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_bg.h View File

@@ -77,8 +77,8 @@
77 77
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Максимум")
78 78
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Фактор")
79 79
 #define MSG_AUTOTEMP                        _UxGT("Авто-темп.")
80
-#define MSG_ON                              _UxGT("Вкл. ")
81
-#define MSG_OFF                             _UxGT("Изкл. ")
80
+#define MSG_LCD_ON                          _UxGT("Вкл.")
81
+#define MSG_LCD_OFF                         _UxGT("Изкл.")
82 82
 #define MSG_A_RETRACT                       _UxGT("A-откат")
83 83
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
84 84
 #define MSG_STEPS_PER_MM                    _UxGT("Стъпки/mm")

+ 2
- 2
Marlin/src/lcd/language/language_ca.h View File

@@ -91,8 +91,8 @@
91 91
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Max")
92 92
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Fact")
93 93
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
94
-#define MSG_ON                              _UxGT("On ")
95
-#define MSG_OFF                             _UxGT("Off")
94
+#define MSG_LCD_ON                          _UxGT("On")
95
+#define MSG_LCD_OFF                         _UxGT("Off")
96 96
 #define MSG_PID_P                           _UxGT("PID-P")
97 97
 #define MSG_PID_I                           _UxGT("PID-I")
98 98
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_cz.h View File

@@ -189,8 +189,8 @@
189 189
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
190 190
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fakt")
191 191
 #define MSG_AUTOTEMP                        _UxGT("Autoteplota")
192
-#define MSG_ON                              _UxGT("Zap")
193
-#define MSG_OFF                             _UxGT("Vyp")
192
+#define MSG_LCD_ON                          _UxGT("Zap")
193
+#define MSG_LCD_OFF                         _UxGT("Vyp")
194 194
 #define MSG_PID_P                           _UxGT("PID-P")
195 195
 #define MSG_PID_I                           _UxGT("PID-I")
196 196
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_da.h View File

@@ -88,8 +88,8 @@
88 88
 #define MSG_MAX                             _UxGT(" \002 Max")
89 89
 #define MSG_FACTOR                          _UxGT(" \002 Fact")
90 90
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
91
-#define MSG_ON                              _UxGT("Til ")
92
-#define MSG_OFF                             _UxGT("Fra")
91
+#define MSG_LCD_ON                          _UxGT("Til")
92
+#define MSG_LCD_OFF                         _UxGT("Fra")
93 93
 #define MSG_PID_P                           _UxGT("PID-P")
94 94
 #define MSG_PID_I                           _UxGT("PID-I")
95 95
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_de.h View File

@@ -201,8 +201,8 @@
201 201
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" max")
202 202
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Faktor")
203 203
 #define MSG_AUTOTEMP                        _UxGT("Auto Temperatur")
204
-#define MSG_ON                              _UxGT("Ein")
205
-#define MSG_OFF                             _UxGT("Aus")
204
+#define MSG_LCD_ON                          _UxGT("Ein")
205
+#define MSG_LCD_OFF                         _UxGT("Aus")
206 206
 #define MSG_PID_P                           _UxGT("PID P")
207 207
 #define MSG_PID_I                           _UxGT("PID I")
208 208
 #define MSG_PID_D                           _UxGT("PID D")

+ 2
- 2
Marlin/src/lcd/language/language_el-gr.h View File

@@ -87,8 +87,8 @@
87 87
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
88 88
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
89 89
 #define MSG_AUTOTEMP                        _UxGT("Αυτομ. ρύθμιση θερμοκρασίας")
90
-#define MSG_ON                              _UxGT("Ενεργοποιημένο")
91
-#define MSG_OFF                             _UxGT("Απενεργοποιημένο")
90
+#define MSG_LCD_ON                          _UxGT("Ενεργοποιημένο")
91
+#define MSG_LCD_OFF                         _UxGT("Απενεργοποιημένο")
92 92
 #define MSG_PID_P                           _UxGT("PID-P")
93 93
 #define MSG_PID_I                           _UxGT("PID-I")
94 94
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_el.h View File

@@ -87,8 +87,8 @@
87 87
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
88 88
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
89 89
 #define MSG_AUTOTEMP                        _UxGT("Αυτομ ρύθμιση θερ/σίας") //SHORTEN
90
-#define MSG_ON                              _UxGT("Ενεργοποιημένο")
91
-#define MSG_OFF                             _UxGT("Απενεργοποιημένο")
90
+#define MSG_LCD_ON                          _UxGT("Ενεργοποιημένο")
91
+#define MSG_LCD_OFF                         _UxGT("Απενεργοποιημένο")
92 92
 #define MSG_PID_P                           _UxGT("PID-P")
93 93
 #define MSG_PID_I                           _UxGT("PID-I")
94 94
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_en.h View File

@@ -540,10 +540,10 @@
540 540
   #define MSG_AUTOTEMP                        _UxGT("Autotemp")
541 541
 #endif
542 542
 #ifndef MSG_ON
543
-  #define MSG_ON                              _UxGT("On ")
543
+  #define MSG_LCD_ON                          _UxGT("On")
544 544
 #endif
545 545
 #ifndef MSG_OFF
546
-  #define MSG_OFF                             _UxGT("Off")
546
+  #define MSG_LCD_OFF                         _UxGT("Off")
547 547
 #endif
548 548
 #ifndef MSG_PID_P
549 549
   #define MSG_PID_P                           _UxGT("PID-P")

+ 2
- 2
Marlin/src/lcd/language/language_es.h View File

@@ -95,8 +95,8 @@
95 95
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
96 96
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
97 97
 #define MSG_AUTOTEMP                        _UxGT("Temperatura Auto.")
98
-#define MSG_ON                              _UxGT("Encender")
99
-#define MSG_OFF                             _UxGT("Apagar")
98
+#define MSG_LCD_ON                          _UxGT("Encender")
99
+#define MSG_LCD_OFF                         _UxGT("Apagar")
100 100
 #define MSG_PID_P                           _UxGT("PID-P")
101 101
 #define MSG_PID_I                           _UxGT("PID-I")
102 102
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_eu.h View File

@@ -182,8 +182,8 @@
182 182
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
183 183
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fakt")
184 184
 #define MSG_AUTOTEMP                        _UxGT("Auto tenperatura")
185
-#define MSG_ON                              _UxGT("On ")
186
-#define MSG_OFF                             _UxGT("Off")
185
+#define MSG_LCD_ON                          _UxGT("On")
186
+#define MSG_LCD_OFF                         _UxGT("Off")
187 187
 #define MSG_PID_P                           _UxGT("PID-P")
188 188
 #define MSG_PID_I                           _UxGT("PID-I")
189 189
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_fi.h View File

@@ -79,8 +79,8 @@
79 79
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Max")
80 80
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Kerr")
81 81
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
82
-#define MSG_ON                              _UxGT("On ")
83
-#define MSG_OFF                             _UxGT("Off")
82
+#define MSG_LCD_ON                          _UxGT("On")
83
+#define MSG_LCD_OFF                         _UxGT("Off")
84 84
 #define MSG_PID_P                           _UxGT("PID-P")
85 85
 #define MSG_PID_I                           _UxGT("PID-I")
86 86
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_fr.h View File

@@ -184,8 +184,8 @@
184 184
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Max")
185 185
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Facteur")
186 186
 #define MSG_AUTOTEMP                        _UxGT("Temp. Auto.")
187
-#define MSG_ON                              _UxGT("Marche ")
188
-#define MSG_OFF                             _UxGT("Arrêt")
187
+#define MSG_LCD_ON                          _UxGT("Marche")
188
+#define MSG_LCD_OFF                         _UxGT("Arrêt")
189 189
 #define MSG_PID_P                           _UxGT("PID-P")
190 190
 #define MSG_PID_I                           _UxGT("PID-I")
191 191
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_gl.h View File

@@ -87,8 +87,8 @@
87 87
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
88 88
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
89 89
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
90
-#define MSG_ON                              _UxGT("On ")
91
-#define MSG_OFF                             _UxGT("Off")
90
+#define MSG_LCD_ON                          _UxGT("On")
91
+#define MSG_LCD_OFF                         _UxGT("Off")
92 92
 #define MSG_PID_P                           _UxGT("PID-P")
93 93
 #define MSG_PID_I                           _UxGT("PID-I")
94 94
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_hr.h View File

@@ -87,8 +87,8 @@
87 87
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
88 88
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
89 89
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
90
-#define MSG_ON                              _UxGT("On ")
91
-#define MSG_OFF                             _UxGT("Off")
90
+#define MSG_LCD_ON                          _UxGT("On")
91
+#define MSG_LCD_OFF                         _UxGT("Off")
92 92
 #define MSG_PID_P                           _UxGT("PID-P")
93 93
 #define MSG_PID_I                           _UxGT("PID-I")
94 94
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_it.h View File

@@ -199,8 +199,8 @@
199 199
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Max")
200 200
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Fact")
201 201
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
202
-#define MSG_ON                              _UxGT("On ")
203
-#define MSG_OFF                             _UxGT("Off")
202
+#define MSG_LCD_ON                          _UxGT("On")
203
+#define MSG_LCD_OFF                         _UxGT("Off")
204 204
 #define MSG_PID_P                           _UxGT("PID-P")
205 205
 #define MSG_PID_I                           _UxGT("PID-I")
206 206
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_jp-kana.h View File

@@ -97,8 +97,8 @@
97 97
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" サイコウ") // " Max"
98 98
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" ファクター") // " Fact"
99 99
 #define MSG_AUTOTEMP                        _UxGT("ジドウオンドセイギョ")               // "Autotemp"
100
-#define MSG_ON                              _UxGT("オン ")                         // "On "
101
-#define MSG_OFF                             _UxGT("オフ ")                         // "Off"
100
+#define MSG_LCD_ON                          _UxGT("オン")                         // "On"
101
+#define MSG_LCD_OFF                         _UxGT("オフ")                         // "Off"
102 102
 #define MSG_PID_P                           _UxGT("PID-P")
103 103
 #define MSG_PID_I                           _UxGT("PID-I")
104 104
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_ko_KR.h View File

@@ -194,8 +194,8 @@
194 194
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
195 195
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
196 196
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
197
-#define MSG_ON                              _UxGT("On ")
198
-#define MSG_OFF                             _UxGT("Off")
197
+#define MSG_LCD_ON                          _UxGT("On")
198
+#define MSG_LCD_OFF                         _UxGT("Off")
199 199
 #define MSG_PID_P                           _UxGT("PID-P")
200 200
 #define MSG_PID_I                           _UxGT("PID-I")
201 201
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_nl.h View File

@@ -95,8 +95,8 @@
95 95
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
96 96
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
97 97
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")
98
-#define MSG_ON                              _UxGT("Aan ")
99
-#define MSG_OFF                             _UxGT("Uit")
98
+#define MSG_LCD_ON                          _UxGT("Aan")
99
+#define MSG_LCD_OFF                         _UxGT("Uit")
100 100
 #define MSG_PID_P                           _UxGT("PID-P")
101 101
 #define MSG_PID_I                           _UxGT("PID-I")
102 102
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_pl.h View File

@@ -85,8 +85,8 @@
85 85
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Max")
86 86
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Mnożnik")
87 87
 #define MSG_AUTOTEMP                        _UxGT("Auto. temperatura")
88
-#define MSG_ON                              _UxGT("Wł. ")
89
-#define MSG_OFF                             _UxGT("Wył.")
88
+#define MSG_LCD_ON                          _UxGT("Wł.")
89
+#define MSG_LCD_OFF                         _UxGT("Wył.")
90 90
 #define MSG_PID_P                           _UxGT("PID-P")
91 91
 #define MSG_PID_I                           _UxGT("PID-I")
92 92
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_pt-br.h View File

@@ -186,8 +186,8 @@
186 186
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" Max")
187 187
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Fator")
188 188
 #define MSG_AUTOTEMP                        _UxGT("Temp. Automática")
189
-#define MSG_ON                              _UxGT("Ligado ")
190
-#define MSG_OFF                             _UxGT("Desligado")
189
+#define MSG_LCD_ON                          _UxGT("Ligado")
190
+#define MSG_LCD_OFF                         _UxGT("Desligado")
191 191
 #define MSG_PID_P                           _UxGT("PID-P")
192 192
 #define MSG_PID_I                           _UxGT("PID-I")
193 193
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_pt.h View File

@@ -85,8 +85,8 @@
85 85
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
86 86
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
87 87
 #define MSG_AUTOTEMP                        _UxGT("Temp. Automática")
88
-#define MSG_ON                              _UxGT("On ")
89
-#define MSG_OFF                             _UxGT("Off")
88
+#define MSG_LCD_ON                          _UxGT("On")
89
+#define MSG_LCD_OFF                         _UxGT("Off")
90 90
 #define MSG_PID_P                           _UxGT("PID-P")
91 91
 #define MSG_PID_I                           _UxGT("PID-I")
92 92
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_ru.h View File

@@ -184,8 +184,8 @@
184 184
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Макс")
185 185
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Фактор")
186 186
 #define MSG_AUTOTEMP                        _UxGT("Автотемпература")
187
-#define MSG_ON                              _UxGT("Вкл.")
188
-#define MSG_OFF                             _UxGT("Выкл.")
187
+#define MSG_LCD_ON                          _UxGT("Вкл.")
188
+#define MSG_LCD_OFF                         _UxGT("Выкл.")
189 189
 #define MSG_PID_P                           _UxGT("PID-P")
190 190
 #define MSG_PID_I                           _UxGT("PID-I")
191 191
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_sk.h View File

@@ -211,8 +211,8 @@
211 211
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
212 212
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fakt")
213 213
 #define MSG_AUTOTEMP                        _UxGT("Auto-teplota")
214
-#define MSG_ON                              _UxGT("Zap")
215
-#define MSG_OFF                             _UxGT("Vyp")
214
+#define MSG_LCD_ON                          _UxGT("Zap")
215
+#define MSG_LCD_OFF                         _UxGT("Vyp")
216 216
 #define MSG_PID_P                           _UxGT("PID-P")
217 217
 #define MSG_PID_I                           _UxGT("PID-I")
218 218
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_tr.h View File

@@ -95,8 +95,8 @@
95 95
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")                //  Max
96 96
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Çarpan")             //  Çarpan
97 97
 #define MSG_AUTOTEMP                        _UxGT("Autotemp")                                           //  Autotemp
98
-#define MSG_ON                              _UxGT("On ")                                                // On
99
-#define MSG_OFF                             _UxGT("Off")                                                // Off
98
+#define MSG_LCD_ON                          _UxGT("On")                                                 // On
99
+#define MSG_LCD_OFF                         _UxGT("Off")                                                // Off
100 100
 #define MSG_PID_P                           _UxGT("PID-P")                                              // PID-P
101 101
 #define MSG_PID_I                           _UxGT("PID-I")                                              // PID-I
102 102
 #define MSG_PID_D                           _UxGT("PID-D")                                              // PID-D

+ 2
- 2
Marlin/src/lcd/language/language_uk.h View File

@@ -87,8 +87,8 @@
87 87
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Макс")
88 88
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Факт")
89 89
 #define MSG_AUTOTEMP                        _UxGT("Автотемпер.")
90
-#define MSG_ON                              _UxGT("Увімк.")
91
-#define MSG_OFF                             _UxGT("Вимк. ")
90
+#define MSG_LCD_ON                          _UxGT("Увімк.")
91
+#define MSG_LCD_OFF                         _UxGT("Вимк.")
92 92
 #define MSG_PID_P                           _UxGT("PID-P")
93 93
 #define MSG_PID_I                           _UxGT("PID-I")
94 94
 #define MSG_PID_D                           _UxGT("PID-D")

+ 2
- 2
Marlin/src/lcd/language/language_zh_CN.h View File

@@ -180,8 +180,8 @@
180 180
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 最大")  //" " LCD_STR_THERMOMETER " Max"
181 181
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 因数")  //" " LCD_STR_THERMOMETER " Fact"
182 182
 #define MSG_AUTOTEMP                        _UxGT("自动控温")  //"Autotemp"
183
-#define MSG_ON                              _UxGT("开 ")  //"On "
184
-#define MSG_OFF                             _UxGT("关 ")  //"Off"
183
+#define MSG_LCD_ON                          _UxGT("开")  //"On"
184
+#define MSG_LCD_OFF                         _UxGT("关")  //"Off"
185 185
 #define MSG_PID_P                           _UxGT("PID-P")  //"PID-P"
186 186
 #define MSG_PID_I                           _UxGT("PID-I")  //"PID-I"
187 187
 #define MSG_PID_D                           _UxGT("PID-D")  //"PID-D"

+ 2
- 2
Marlin/src/lcd/language/language_zh_TW.h View File

@@ -180,8 +180,8 @@
180 180
 #define MSG_MAX                             _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 最大")  //" " LCD_STR_THERMOMETER " Max"
181 181
 #define MSG_FACTOR                          _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 系數")  //" " LCD_STR_THERMOMETER " Fact"
182 182
 #define MSG_AUTOTEMP                        _UxGT("自動控溫")  //"Autotemp"
183
-#define MSG_ON                              _UxGT("開 ")  //"On "
184
-#define MSG_OFF                             _UxGT("關 ")  //"Off"
183
+#define MSG_LCD_ON                          _UxGT("開")  //"On"
184
+#define MSG_LCD_OFF                         _UxGT("關")  //"Off"
185 185
 #define MSG_PID_P                           _UxGT("PID-P")  //"PID-P"
186 186
 #define MSG_PID_I                           _UxGT("PID-I")  //"PID-I"
187 187
 #define MSG_PID_D                           _UxGT("PID-D")  //"PID-D"

+ 2
- 2
Marlin/src/lcd/menu/menu.h View File

@@ -74,7 +74,7 @@ void draw_edit_screen(PGM_P const pstr, const char* const value=NULL);
74 74
   #define draw_menu_item_setting_edit_generic(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, false)
75 75
   #define draw_menu_item_setting_edit_generic_P(sel, row, pstr, data) _drawmenu_setting_edit_generic(sel, row, pstr, data, true)
76 76
   #define DRAWMENU_SETTING_EDIT_GENERIC(SRC) draw_menu_item_setting_edit_generic(sel, row, pstr, SRC)
77
-  #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))
77
+  #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))
78 78
   #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(MESH_EDIT_GFX_OVERLAY)
79 79
     void _lcd_zoffset_overlay_gfx(const float zvalue);
80 80
   #endif
@@ -83,7 +83,7 @@ void draw_edit_screen(PGM_P const pstr, const char* const value=NULL);
83 83
   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);
84 84
   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);
85 85
   #define DRAWMENU_SETTING_EDIT_GENERIC(SRC) draw_menu_item_setting_edit_generic(sel, row, pstr, '>', SRC)
86
-  #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))
86
+  #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))
87 87
 #endif
88 88
 #define draw_menu_item_submenu(sel, row, pstr, data) draw_menu_item_generic(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0])
89 89
 #define draw_menu_item_gcode(sel, row, pstr, gcode) draw_menu_item_generic(sel, row, pstr, '>', ' ')

Loading…
Cancel
Save