bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Differentiate translated On/Off from Serial ON/OFF

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-12 17:04:00 -06:00
parent df907a905f
commit 50af1d1e08
36 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/core/language.h
View File

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

8
Marlin/src/core/serial.cpp
View File

@@ -21,6 +21,7 @@
*/ */
#include "serial.h" #include "serial.h"
#include "language.h"
uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE; 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); 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, 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, char v) { serialprintPGM(s_P); SERIAL_CHAR(v); }
void serial_echopair_PGM(PGM_P s_P, int v) { serialprintPGM(s_P); SERIAL_ECHO(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_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
void serial_echo_start() { serialprintPGM(echomagic); } void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(MSG_ON) : PSTR(MSG_OFF)); }
void serial_error_start() { serialprintPGM(errormagic); } void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EOL(); }
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)

2
Marlin/src/core/serial.h
View File

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

3
Marlin/src/gcode/bedlevel/M420.cpp
View File

@@ -212,7 +212,8 @@ void GcodeSuite::M420() {
} }
SERIAL_ECHO_START(); 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) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
SERIAL_ECHO_START(); SERIAL_ECHO_START();

3
Marlin/src/gcode/bedlevel/mbl/G29.cpp
View File

@@ -80,7 +80,8 @@ void GcodeSuite::G29() {
switch (state) { switch (state) {
case MeshReport: case MeshReport:
if (leveling_is_valid()) { 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(); mbl.report_mesh();
} }
else else

8
Marlin/src/gcode/control/M211.cpp
View File

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

3
Marlin/src/gcode/control/M605.cpp
View File

@@ -153,7 +153,8 @@
planner.synchronize(); planner.synchronize();
extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE; extruder_duplication_enabled = parser.intval('S') == (int)DXC_DUPLICATION_MODE;
SERIAL_ECHO_START(); 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 #endif // DUAL_NOZZLE_DUPLICATION_MODE

4
Marlin/src/lcd/language/language_an.h
View File

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

4
Marlin/src/lcd/language/language_bg.h
View File

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

4
Marlin/src/lcd/language/language_ca.h
View File

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

4
Marlin/src/lcd/language/language_cz.h
View File

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

4
Marlin/src/lcd/language/language_da.h
View File

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

4
Marlin/src/lcd/language/language_de.h
View File

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

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

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

4
Marlin/src/lcd/language/language_el.h
View File

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

4
Marlin/src/lcd/language/language_en.h
View File

@@ -540,10 +540,10 @@
#define MSG_AUTOTEMP _UxGT("Autotemp") #define MSG_AUTOTEMP _UxGT("Autotemp")
#endif #endif
#ifndef MSG_ON #ifndef MSG_ON
#define MSG_ON _UxGT("On ") #define MSG_LCD_ON _UxGT("On")
#endif #endif
#ifndef MSG_OFF #ifndef MSG_OFF
#define MSG_OFF _UxGT("Off") #define MSG_LCD_OFF _UxGT("Off")
#endif #endif
#ifndef MSG_PID_P #ifndef MSG_PID_P
#define MSG_PID_P _UxGT("PID-P") #define MSG_PID_P _UxGT("PID-P")

4
Marlin/src/lcd/language/language_es.h
View File

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

4
Marlin/src/lcd/language/language_eu.h
View File

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

4
Marlin/src/lcd/language/language_fi.h
View File

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

4
Marlin/src/lcd/language/language_fr.h
View File

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

4
Marlin/src/lcd/language/language_gl.h
View File

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

4
Marlin/src/lcd/language/language_hr.h
View File

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

4
Marlin/src/lcd/language/language_it.h
View File

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

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

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

4
Marlin/src/lcd/language/language_ko_KR.h
View File

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

4
Marlin/src/lcd/language/language_nl.h
View File

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

4
Marlin/src/lcd/language/language_pl.h
View File

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

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

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

4
Marlin/src/lcd/language/language_pt.h
View File

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

4
Marlin/src/lcd/language/language_ru.h
View File

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

4
Marlin/src/lcd/language/language_sk.h
View File

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

4
Marlin/src/lcd/language/language_tr.h
View File

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

4
Marlin/src/lcd/language/language_uk.h
View File

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

4
Marlin/src/lcd/language/language_zh_CN.h
View File

@@ -180,8 +180,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 最大") //" " LCD_STR_THERMOMETER " Max" #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_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 因数") //" " LCD_STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP _UxGT("自动控温") //"Autotemp" #define MSG_AUTOTEMP _UxGT("自动控温") //"Autotemp"
#define MSG_ON _UxGT("开 ") //"On " #define MSG_LCD_ON _UxGT("开") //"On"
#define MSG_OFF _UxGT("关 ") //"Off" #define MSG_LCD_OFF _UxGT("关") //"Off"
#define MSG_PID_P _UxGT("PID-P") //"PID-P" #define MSG_PID_P _UxGT("PID-P") //"PID-P"
#define MSG_PID_I _UxGT("PID-I") //"PID-I" #define MSG_PID_I _UxGT("PID-I") //"PID-I"
#define MSG_PID_D _UxGT("PID-D") //"PID-D" #define MSG_PID_D _UxGT("PID-D") //"PID-D"

4
Marlin/src/lcd/language/language_zh_TW.h
View File

@@ -180,8 +180,8 @@
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 最大") //" " LCD_STR_THERMOMETER " Max" #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_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" 系數") //" " LCD_STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP _UxGT("自動控溫") //"Autotemp" #define MSG_AUTOTEMP _UxGT("自動控溫") //"Autotemp"
#define MSG_ON _UxGT("開 ") //"On " #define MSG_LCD_ON _UxGT("開") //"On"
#define MSG_OFF _UxGT("關 ") //"Off" #define MSG_LCD_OFF _UxGT("關") //"Off"
#define MSG_PID_P _UxGT("PID-P") //"PID-P" #define MSG_PID_P _UxGT("PID-P") //"PID-P"
#define MSG_PID_I _UxGT("PID-I") //"PID-I" #define MSG_PID_I _UxGT("PID-I") //"PID-I"
#define MSG_PID_D _UxGT("PID-D") //"PID-D" #define MSG_PID_D _UxGT("PID-D") //"PID-D"

4
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);
#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(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 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 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) #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(MESH_EDIT_GFX_OVERLAY)
void _lcd_zoffset_overlay_gfx(const float zvalue); void _lcd_zoffset_overlay_gfx(const float zvalue);
#endif #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(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); 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 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 #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_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, '>', ' ') #define draw_menu_item_gcode(sel, row, pstr, gcode) draw_menu_item_generic(sel, row, pstr, '>', ' ')