diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index aa1733cc26fab8ea9962286bdebeb97c4b4c42d4..2f49a7503f546c34cc6bd54099c85a1d9052f4d1 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -778,13 +778,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 8b419b9e7e9cb6a1fa8b749682519ae8fd3f8703..2fe4f2640f82816c430f5b24029d0a9616200a82 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4908,32 +4908,32 @@ inline void gcode_M140() {
case 0:
if (code_seen('H')) {
v = code_value_int();
- plaPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+ preheatHotendTemp1 = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
}
if (code_seen('F')) {
v = code_value_int();
- plaPreheatFanSpeed = constrain(v, 0, 255);
+ preheatFanSpeed1 = constrain(v, 0, 255);
}
#if TEMP_SENSOR_BED != 0
if (code_seen('B')) {
v = code_value_int();
- plaPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+ preheatBedTemp1 = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
}
#endif
break;
case 1:
if (code_seen('H')) {
v = code_value_int();
- absPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+ preheatHotendTemp2 = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
}
if (code_seen('F')) {
v = code_value_int();
- absPreheatFanSpeed = constrain(v, 0, 255);
+ preheatFanSpeed2 = constrain(v, 0, 255);
}
#if TEMP_SENSOR_BED != 0
if (code_seen('B')) {
v = code_value_int();
- absPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+ preheatBedTemp2 = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
}
#endif
break;
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 3200982a0e882dd6210f8cfd75dc93ea07f1e460..808bb811df4f7dc4662879f8da68bc10a971edcd 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -644,6 +644,18 @@
#error "SERVO_DEACTIVATION_DELAY is deprecated. Use SERVO_DELAY instead."
#elif ENABLED(FILAMENTCHANGEENABLE)
#error "FILAMENTCHANGEENABLE is now FILAMENT_CHANGE_FEATURE. Please update your configuration."
+#elif defined(PLA_PREHEAT_HOTEND_TEMP)
+ #error "PLA_PREHEAT_HOTEND_TEMP is now PREHEAT_1_TEMP_HOTEND. Please update your configuration."
+#elif defined(PLA_PREHEAT_HPB_TEMP)
+ #error "PLA_PREHEAT_HPB_TEMP is now PREHEAT_1_TEMP_BED. Please update your configuration."
+#elif defined(PLA_PREHEAT_FAN_SPEED)
+ #error "PLA_PREHEAT_FAN_SPEED is now PREHEAT_1_FAN_SPEED. Please update your configuration."
+#elif defined(ABS_PREHEAT_HOTEND_TEMP)
+ #error "ABS_PREHEAT_HOTEND_TEMP is now PREHEAT_2_TEMP_HOTEND. Please update your configuration."
+#elif defined(ABS_PREHEAT_HPB_TEMP)
+ #error "ABS_PREHEAT_HPB_TEMP is now PREHEAT_2_TEMP_BED. Please update your configuration."
+#elif defined(ABS_PREHEAT_FAN_SPEED)
+ #error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED. Please update your configuration."
#endif
#endif //SANITYCHECK_H
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index 4420a0e1f7d3c8a1bf9a3cabd7409e60e63c80d9..9ea428269d2e1d8be666cf7c1d140e2fb6d5c00b 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -85,12 +85,12 @@
* 285 M666 Z z_endstop_adj (float)
*
* ULTIPANEL:
- * 289 M145 S0 H plaPreheatHotendTemp (int)
- * 291 M145 S0 B plaPreheatHPBTemp (int)
- * 293 M145 S0 F plaPreheatFanSpeed (int)
- * 295 M145 S1 H absPreheatHotendTemp (int)
- * 297 M145 S1 B absPreheatHPBTemp (int)
- * 299 M145 S1 F absPreheatFanSpeed (int)
+ * 289 M145 S0 H preheatHotendTemp1 (int)
+ * 291 M145 S0 B preheatBedTemp1 (int)
+ * 293 M145 S0 F preheatFanSpeed1 (int)
+ * 295 M145 S1 H preheatHotendTemp2 (int)
+ * 297 M145 S1 B preheatBedTemp2 (int)
+ * 299 M145 S1 F preheatFanSpeed2 (int)
*
* PIDTEMP:
* 301 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
@@ -262,16 +262,16 @@ void Config_StoreSettings() {
#endif
#if DISABLED(ULTIPANEL)
- int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP, plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP, plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED,
- absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP, absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP, absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
+ int preheatHotendTemp1 = PREHEAT_1_TEMP_HOTEND, preheatBedTemp1 = PREHEAT_1_TEMP_BED, preheatFanSpeed1 = PREHEAT_1_FAN_SPEED,
+ preheatHotendTemp2 = PREHEAT_2_TEMP_HOTEND, preheatBedTemp2 = PREHEAT_2_TEMP_BED, preheatFanSpeed2 = PREHEAT_2_FAN_SPEED;
#endif // !ULTIPANEL
- EEPROM_WRITE_VAR(i, plaPreheatHotendTemp);
- EEPROM_WRITE_VAR(i, plaPreheatHPBTemp);
- EEPROM_WRITE_VAR(i, plaPreheatFanSpeed);
- EEPROM_WRITE_VAR(i, absPreheatHotendTemp);
- EEPROM_WRITE_VAR(i, absPreheatHPBTemp);
- EEPROM_WRITE_VAR(i, absPreheatFanSpeed);
+ EEPROM_WRITE_VAR(i, preheatHotendTemp1);
+ EEPROM_WRITE_VAR(i, preheatBedTemp1);
+ EEPROM_WRITE_VAR(i, preheatFanSpeed1);
+ EEPROM_WRITE_VAR(i, preheatHotendTemp2);
+ EEPROM_WRITE_VAR(i, preheatBedTemp2);
+ EEPROM_WRITE_VAR(i, preheatFanSpeed2);
for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
@@ -447,16 +447,16 @@ void Config_RetrieveSettings() {
#endif
#if DISABLED(ULTIPANEL)
- int plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed,
- absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed;
+ int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
+ preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
#endif
- EEPROM_READ_VAR(i, plaPreheatHotendTemp);
- EEPROM_READ_VAR(i, plaPreheatHPBTemp);
- EEPROM_READ_VAR(i, plaPreheatFanSpeed);
- EEPROM_READ_VAR(i, absPreheatHotendTemp);
- EEPROM_READ_VAR(i, absPreheatHPBTemp);
- EEPROM_READ_VAR(i, absPreheatFanSpeed);
+ EEPROM_READ_VAR(i, preheatHotendTemp1);
+ EEPROM_READ_VAR(i, preheatBedTemp1);
+ EEPROM_READ_VAR(i, preheatFanSpeed1);
+ EEPROM_READ_VAR(i, preheatHotendTemp2);
+ EEPROM_READ_VAR(i, preheatBedTemp2);
+ EEPROM_READ_VAR(i, preheatFanSpeed2);
#if ENABLED(PIDTEMP)
for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
@@ -604,12 +604,12 @@ void Config_ResetDefault() {
#endif
#if ENABLED(ULTIPANEL)
- plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP;
- plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP;
- plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
- absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP;
- absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP;
- absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
+ preheatHotendTemp1 = PREHEAT_1_TEMP_HOTEND;
+ preheatBedTemp1 = PREHEAT_1_TEMP_BED;
+ preheatFanSpeed1 = PREHEAT_1_FAN_SPEED;
+ preheatHotendTemp2 = PREHEAT_2_TEMP_HOTEND;
+ preheatBedTemp2 = PREHEAT_2_TEMP_BED;
+ preheatFanSpeed2 = PREHEAT_2_FAN_SPEED;
#endif
#if HAS_LCD_CONTRAST
@@ -814,14 +814,14 @@ void Config_PrintSettings(bool forReplay) {
SERIAL_ECHOLNPGM("Material heatup parameters:");
CONFIG_ECHO_START;
}
- SERIAL_ECHOPAIR(" M145 S0 H", plaPreheatHotendTemp);
- SERIAL_ECHOPAIR(" B", plaPreheatHPBTemp);
- SERIAL_ECHOPAIR(" F", plaPreheatFanSpeed);
+ SERIAL_ECHOPAIR(" M145 S0 H", preheatHotendTemp1);
+ SERIAL_ECHOPAIR(" B", preheatBedTemp1);
+ SERIAL_ECHOPAIR(" F", preheatFanSpeed1);
SERIAL_EOL;
CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M145 S1 H", absPreheatHotendTemp);
- SERIAL_ECHOPAIR(" B", absPreheatHPBTemp);
- SERIAL_ECHOPAIR(" F", absPreheatFanSpeed);
+ SERIAL_ECHOPAIR(" M145 S1 H", preheatHotendTemp2);
+ SERIAL_ECHOPAIR(" B", preheatBedTemp2);
+ SERIAL_ECHOPAIR(" F", preheatFanSpeed2);
SERIAL_EOL;
#endif // ULTIPANEL
diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
index 2fd390eed2f48f6a11eaaeb80a253adaef94a5a4..7378e822ef4a20a21c4c331160102360a50105fc 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -777,13 +777,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 190
-#define PLA_PREHEAT_HPB_TEMP 50
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 190
+#define PREHEAT_1_TEMP_BED 50
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index d8495eb840d37202ee4ef4dfd4ab56fb27edbb72..af7c7393cd5ebac82bef1838933da3e18e3c76de 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -761,13 +761,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index 731d8ce5eca514ff168079356817031d57577bab..6bdcbfecbcbde89963c8b2ed5cad60e92d2804c1 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -759,13 +759,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index a047e59c55707578c5ffdcbbddaddefbdec3bd86..f6e5934a942a5d1abbf18f7ac89d9b339a87fec7 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -770,13 +770,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 200
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 200
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 220
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 220
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h
index 4704fa82271d7ca266545d3e6dda730bddeee6aa..fcfca317f9ad7b273ee5bdec691337ef8968a59c 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@@ -772,13 +772,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 210
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index 5267edcbd24ecd5f9e4456b34f8381ea8eeba55b..3173f684949a0a2fbb22bbbd9601d33570c00eca 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -795,13 +795,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 190
-#define PLA_PREHEAT_HPB_TEMP 50 // K8200: set back to 70 if you have an upgraded heatbed power supply
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 190
+#define PREHEAT_1_TEMP_BED 50 // K8200: set back to 70 if you have an upgraded heatbed power supply
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 60 // K8200: set back to 110 if you have an upgraded heatbed power supply
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 60 // K8200: set back to 110 if you have an upgraded heatbed power supply
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h
index a7c61de56be75ec37524a17ea5eadb02fd428c17..19ae33b7e1215a42d1683dc7cac48f53ff208bdb 100644
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@@ -778,13 +778,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 210
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 165 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 245
-#define ABS_PREHEAT_HPB_TEMP 0
-#define ABS_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 245
+#define PREHEAT_2_TEMP_BED 0
+#define PREHEAT_2_FAN_SPEED 165 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/K8400/Dual Heads/Configuration.h b/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
index c244ea0432a359ead63f034e98d2ebd9fab26d80..88c0edbabbf946a58500fd61cbd42c7061b82e5c 100644
--- a/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
@@ -778,13 +778,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 210
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 165 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 245
-#define ABS_PREHEAT_HPB_TEMP 0
-#define ABS_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 245
+#define PREHEAT_2_TEMP_BED 0
+#define PREHEAT_2_FAN_SPEED 165 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index e394b6b2af77dc98a4fa73335c07faaf2fac9ace..308065a371c1bab95c7fd1e2641470bd58a36652 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -778,13 +778,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index ad5c408500254e645ea208b314754934fd5140d8..d50fbd6cfc8a1578303d1f6a24612af6039fee0f 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -776,13 +776,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 1c23794d014f46733ad3854c3b9877502af87d2f..9cc81a8c7a00480384fb01aa641aa72bb17e4111 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -786,13 +786,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index e5a7dd84431f9da34dfb74326b735c3049c996dd..5898a987538073a95e634b761919bb00a90e32e7 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -799,13 +799,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 230
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 230
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index d3012dbfb1b01a15e609c92ff477be09c35bfe95..8146ca77f9b11ab23fb5e2fcaa730645095ee9e8 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -770,13 +770,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 200
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 200
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 220
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 220
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index 9c4f23d181813b2f1b000888895ca8db2f14e165..b48f086bab748f11deb285d2ffca52803eb3345e 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -778,13 +778,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 3dfd2dd93f58342faa534fdc590e97eb37ce571a..cf8a521801a7128ab875133c6344c1bc1c039ff1 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -873,13 +873,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 396a4067100d67bddb127f228be126df02bc851f..1b5c3c84484c77290bc75fbc10b8c222ef0558bb 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -867,13 +867,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 53f0310b0b2b65a41977ea11ef746a30124f05c1..1551951bf8ea24e945ab1deae49a80c3ab5ce713 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -870,13 +870,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index ec37272def1f196840114e86670648ad1a978391..d258e9ee9dd34eb79e09d6104e95b24c50d99444 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -870,13 +870,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index 1d17d17f1f999a99711445329ea09b34536a36da..4af995219118e0ca7deb38dd6dc44142cab58afa 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -872,13 +872,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index 6543925582a42fa87e9a0e26362f9d787a525060..2b3332062bd16ab9e6b2fd77058e29e7b5d481af 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -781,13 +781,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 8d14edadfb85f339751cdf142eabe896fbc7d14e..8e60ffeea8c21cc80c32a3b08fe92d80c97bc99f 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -772,13 +772,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/language_an.h b/Marlin/language_an.h
index 968fa5168f92033972263026bc00afc8300a1f95..eb4eb8058aae0206495b2cf68492f71bf6f8c575 100644
--- a/Marlin/language_an.h
+++ b/Marlin/language_an.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Establir zero"
-#define MSG_PREHEAT_PLA "Precalentar PLA"
-#define MSG_PREHEAT_PLA_N "Precalentar PLA "
-#define MSG_PREHEAT_PLA_ALL "Precalentar PLA a"
-#define MSG_PREHEAT_PLA_BEDONLY "Prec. PLA Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Achustar tem. PLA"
-#define MSG_PREHEAT_ABS "Precalentar ABS"
-#define MSG_PREHEAT_ABS_N "Precalentar ABS "
-#define MSG_PREHEAT_ABS_ALL "Precalentar ABS a"
-#define MSG_PREHEAT_ABS_BEDONLY "Prec. ABS Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Achustar tem. ABS"
+#define MSG_PREHEAT_1 "Precalentar PLA"
+#define MSG_PREHEAT_1_N "Precalentar PLA "
+#define MSG_PREHEAT_1_ALL "Precalentar PLA a"
+#define MSG_PREHEAT_1_BEDONLY "Prec. PLA Base"
+#define MSG_PREHEAT_1_SETTINGS "Achustar tem. PLA"
+#define MSG_PREHEAT_2 "Precalentar ABS"
+#define MSG_PREHEAT_2_N "Precalentar ABS "
+#define MSG_PREHEAT_2_ALL "Precalentar ABS a"
+#define MSG_PREHEAT_2_BEDONLY "Prec. ABS Base"
+#define MSG_PREHEAT_2_SETTINGS "Achustar tem. ABS"
#define MSG_COOLDOWN "Enfriar"
#define MSG_SWITCH_PS_ON "Enchegar Fuent"
#define MSG_SWITCH_PS_OFF "Desenchegar Fuent"
diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h
index 3fc7a5bee78fdfb139c7f0efd281f703309e5100..8b42904673ea2a9da2425d51e1456ff4fa33102c 100644
--- a/Marlin/language_bg.h
+++ b/Marlin/language_bg.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Задай Начало"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Изходна точка"
-#define MSG_PREHEAT_PLA "Подгряване PLA"
-#define MSG_PREHEAT_PLA_N "Подгряване PLA"
-#define MSG_PREHEAT_PLA_ALL "Подгр. PLA Всички"
-#define MSG_PREHEAT_PLA_BEDONLY "Подгр. PLA Легло"
-#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
-#define MSG_PREHEAT_ABS "Подгряване ABS"
-#define MSG_PREHEAT_ABS_N "Подгряване ABS"
-#define MSG_PREHEAT_ABS_ALL "Подгр. ABS Всички"
-#define MSG_PREHEAT_ABS_BEDONLY "Подгр. ABS Легло"
-#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
+#define MSG_PREHEAT_1 "Подгряване PLA"
+#define MSG_PREHEAT_1_N "Подгряване PLA"
+#define MSG_PREHEAT_1_ALL "Подгр. PLA Всички"
+#define MSG_PREHEAT_1_BEDONLY "Подгр. PLA Легло"
+#define MSG_PREHEAT_1_SETTINGS "Настройки PLA"
+#define MSG_PREHEAT_2 "Подгряване ABS"
+#define MSG_PREHEAT_2_N "Подгряване ABS"
+#define MSG_PREHEAT_2_ALL "Подгр. ABS Всички"
+#define MSG_PREHEAT_2_BEDONLY "Подгр. ABS Легло"
+#define MSG_PREHEAT_2_SETTINGS "Настройки ABS"
#define MSG_COOLDOWN "Охлаждане"
#define MSG_SWITCH_PS_ON "Вкл. захранване"
#define MSG_SWITCH_PS_OFF "Изкл. захранване"
diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h
index 9c2ba49d3062eae137c7533cd16c615300301fbf..a7cbb2563ac4a26437a5dc026f24ffd58432c891 100644
--- a/Marlin/language_ca.h
+++ b/Marlin/language_ca.h
@@ -50,16 +50,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Establir origen"
-#define MSG_PREHEAT_PLA "Preescalfar PLA"
-#define MSG_PREHEAT_PLA_N "Preescalfar PLA "
-#define MSG_PREHEAT_PLA_ALL "Preesc. tot PLA"
-#define MSG_PREHEAT_PLA_BEDONLY "Preesc. llit PLA"
-#define MSG_PREHEAT_PLA_SETTINGS "Configuració PLA"
-#define MSG_PREHEAT_ABS "Preescalfar ABS"
-#define MSG_PREHEAT_ABS_N "Preescalfar ABS "
-#define MSG_PREHEAT_ABS_ALL "Preesc. tot ABS"
-#define MSG_PREHEAT_ABS_BEDONLY "Preesc. llit ABS"
-#define MSG_PREHEAT_ABS_SETTINGS "Configuració ABS"
+#define MSG_PREHEAT_1 "Preescalfar PLA"
+#define MSG_PREHEAT_1_N "Preescalfar PLA "
+#define MSG_PREHEAT_1_ALL "Preesc. tot PLA"
+#define MSG_PREHEAT_1_BEDONLY "Preesc. llit PLA"
+#define MSG_PREHEAT_1_SETTINGS "Configuració PLA"
+#define MSG_PREHEAT_2 "Preescalfar ABS"
+#define MSG_PREHEAT_2_N "Preescalfar ABS "
+#define MSG_PREHEAT_2_ALL "Preesc. tot ABS"
+#define MSG_PREHEAT_2_BEDONLY "Preesc. llit ABS"
+#define MSG_PREHEAT_2_SETTINGS "Configuració ABS"
#define MSG_COOLDOWN "Refredar"
#define MSG_SWITCH_PS_ON "Switch power on"
#define MSG_SWITCH_PS_OFF "Switch power off"
diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h
index e2306a401d66380060823b0d7049c9b59106da7c..12a66a3c55bac9801780b002b316802e1de51842 100644
--- a/Marlin/language_cn.h
+++ b/Marlin/language_cn.h
@@ -47,16 +47,16 @@
#define MSG_SET_HOME_OFFSETS "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "\xbe\xbf\xbc\xbd"
-#define MSG_PREHEAT_PLA "\xc3\xc4 PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \xc5\xc6"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xc4\xc7"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xbf"
-#define MSG_PREHEAT_ABS "\xc3\xc4 ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xc5\xc6"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xbe\xc6"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xbf"
+#define MSG_PREHEAT_1 "\xc3\xc4 PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " \xc5\xc6"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " \xc4\xc7"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " \xbe\xbf"
+#define MSG_PREHEAT_2 "\xc3\xc4 ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " \xc5\xc6"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " \xbe\xc6"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " \xbe\xbf"
#define MSG_COOLDOWN "\xc8\xc9"
#define MSG_SWITCH_PS_ON "\xb9\xcb\xca\xb3"
#define MSG_SWITCH_PS_OFF "\xb9\xcb\xb5\xb6"
diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h
index fabaf0e982cb6d9ed36e158025133eb976659862..ddaf6a77fd5c17986c7e8950dc527d6e9ca1d810 100644
--- a/Marlin/language_cz.h
+++ b/Marlin/language_cz.h
@@ -58,16 +58,16 @@
#define MSG_SET_HOME_OFFSETS "Nastavit ofsety"
#define MSG_HOME_OFFSETS_APPLIED "Ofsety nastaveny"
#define MSG_SET_ORIGIN "Nastavit pocatek"
-#define MSG_PREHEAT_PLA "Zahrat PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Vse"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Podloz"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " Nast"
-#define MSG_PREHEAT_ABS "Zahrat ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Vse"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Podloz"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " Nast"
+#define MSG_PREHEAT_1 "Zahrat PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " Vse"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Podloz"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " Nast"
+#define MSG_PREHEAT_2 "Zahrat ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " Vse"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Podloz"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " Nast"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_da.h b/Marlin/language_da.h
index 55c9fd48c6b52a8a89dba669ad82e1dd2bc7efd1..833a6b26a80bf6b0099502c71555c5569741c4cc 100644
--- a/Marlin/language_da.h
+++ b/Marlin/language_da.h
@@ -54,16 +54,16 @@
#define MSG_SET_HOME_OFFSETS "Sæt forskyding af home"
#define MSG_HOME_OFFSETS_APPLIED "Forskydninger af home pos. er tilføjet"
#define MSG_SET_ORIGIN "Sæt origin"
-#define MSG_PREHEAT_PLA "Forvarm PLA"
-#define MSG_PREHEAT_PLA_N "Forvarm PLA "
-#define MSG_PREHEAT_PLA_ALL "Forvarm PLA Alle"
-#define MSG_PREHEAT_PLA_BEDONLY "Forvarm PLA Bed"
-#define MSG_PREHEAT_PLA_SETTINGS "Forvarm PLA conf"
-#define MSG_PREHEAT_ABS "Forvarm ABS"
-#define MSG_PREHEAT_ABS_N "Forvarm ABS "
-#define MSG_PREHEAT_ABS_ALL "Forvarm ABS Alle"
-#define MSG_PREHEAT_ABS_BEDONLY "Forvarm ABS Bed"
-#define MSG_PREHEAT_ABS_SETTINGS "Forvarm ABS conf"
+#define MSG_PREHEAT_1 "Forvarm PLA"
+#define MSG_PREHEAT_1_N "Forvarm PLA "
+#define MSG_PREHEAT_1_ALL "Forvarm PLA Alle"
+#define MSG_PREHEAT_1_BEDONLY "Forvarm PLA Bed"
+#define MSG_PREHEAT_1_SETTINGS "Forvarm PLA conf"
+#define MSG_PREHEAT_2 "Forvarm ABS"
+#define MSG_PREHEAT_2_N "Forvarm ABS "
+#define MSG_PREHEAT_2_ALL "Forvarm ABS Alle"
+#define MSG_PREHEAT_2_BEDONLY "Forvarm ABS Bed"
+#define MSG_PREHEAT_2_SETTINGS "Forvarm ABS conf"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_de.h b/Marlin/language_de.h
index 58acd952783c143bdda86ce9dded0d88fcf2d4c5..3077e6b4584f2e3baec542259850b1117eefc8be 100644
--- a/Marlin/language_de.h
+++ b/Marlin/language_de.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Setze Homeoffsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets aktiv"
#define MSG_SET_ORIGIN "Setze Nullpunkt" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
-#define MSG_PREHEAT_PLA "Vorwärmen PLA"
-#define MSG_PREHEAT_PLA_N "Vorwärmen PLA "
-#define MSG_PREHEAT_PLA_ALL "Vorw. PLA Alle"
-#define MSG_PREHEAT_PLA_BEDONLY "Vorw. PLA Bett"
-#define MSG_PREHEAT_PLA_SETTINGS "Vorw. PLA Einst."
-#define MSG_PREHEAT_ABS "Vorwärmen ABS"
-#define MSG_PREHEAT_ABS_N "Vorwärmen ABS "
-#define MSG_PREHEAT_ABS_ALL "Vorw. ABS Alle"
-#define MSG_PREHEAT_ABS_BEDONLY "Vorw. ABS Bett"
-#define MSG_PREHEAT_ABS_SETTINGS "Vorw. ABS Einst."
+#define MSG_PREHEAT_1 "Vorwärmen PLA"
+#define MSG_PREHEAT_1_N "Vorwärmen PLA "
+#define MSG_PREHEAT_1_ALL "Vorw. PLA Alle"
+#define MSG_PREHEAT_1_BEDONLY "Vorw. PLA Bett"
+#define MSG_PREHEAT_1_SETTINGS "Vorw. PLA Einst."
+#define MSG_PREHEAT_2 "Vorwärmen ABS"
+#define MSG_PREHEAT_2_N "Vorwärmen ABS "
+#define MSG_PREHEAT_2_ALL "Vorw. ABS Alle"
+#define MSG_PREHEAT_2_BEDONLY "Vorw. ABS Bett"
+#define MSG_PREHEAT_2_SETTINGS "Vorw. ABS Einst."
#define MSG_COOLDOWN "Abkühlen"
#define MSG_SWITCH_PS_ON "Netzteil ein"
#define MSG_SWITCH_PS_OFF "Netzteil aus"
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index f69ef9ca3ba2fee11e21e736da7a6472f960486b..12cf6200473f26a2119941ebf6abb97f1640dfcb 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -97,35 +97,35 @@
#ifndef MSG_SET_ORIGIN
#define MSG_SET_ORIGIN "Set origin"
#endif
-#ifndef MSG_PREHEAT_PLA
- #define MSG_PREHEAT_PLA "Preheat PLA"
+#ifndef MSG_PREHEAT_1
+ #define MSG_PREHEAT_1 "Preheat PLA"
#endif
-#ifndef MSG_PREHEAT_PLA_N
- #define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
+#ifndef MSG_PREHEAT_1_N
+ #define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
#endif
-#ifndef MSG_PREHEAT_PLA_ALL
- #define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
+#ifndef MSG_PREHEAT_1_ALL
+ #define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " All"
#endif
-#ifndef MSG_PREHEAT_PLA_BEDONLY
- #define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
+#ifndef MSG_PREHEAT_1_BEDONLY
+ #define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Bed"
#endif
-#ifndef MSG_PREHEAT_PLA_SETTINGS
- #define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
+#ifndef MSG_PREHEAT_1_SETTINGS
+ #define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " conf"
#endif
-#ifndef MSG_PREHEAT_ABS
- #define MSG_PREHEAT_ABS "Preheat ABS"
+#ifndef MSG_PREHEAT_2
+ #define MSG_PREHEAT_2 "Preheat ABS"
#endif
-#ifndef MSG_PREHEAT_ABS_N
- #define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
+#ifndef MSG_PREHEAT_2_N
+ #define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
#endif
-#ifndef MSG_PREHEAT_ABS_ALL
- #define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
+#ifndef MSG_PREHEAT_2_ALL
+ #define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " All"
#endif
-#ifndef MSG_PREHEAT_ABS_BEDONLY
- #define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
+#ifndef MSG_PREHEAT_2_BEDONLY
+ #define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Bed"
#endif
-#ifndef MSG_PREHEAT_ABS_SETTINGS
- #define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
+#ifndef MSG_PREHEAT_2_SETTINGS
+ #define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " conf"
#endif
#ifndef MSG_H1
#define MSG_H1 "1"
diff --git a/Marlin/language_es.h b/Marlin/language_es.h
index 9722ccd2ef92a42f1fa30828264d2879dc78e6c8..7b2ba2a0062ce954bb924f49a98cfffe2c476c1d 100644
--- a/Marlin/language_es.h
+++ b/Marlin/language_es.h
@@ -53,16 +53,16 @@
#define MSG_SET_HOME_OFFSETS "Ajustar desfases"
#define MSG_HOME_OFFSETS_APPLIED "Desfase aplicado"
#define MSG_SET_ORIGIN "Establecer origen"
-#define MSG_PREHEAT_PLA "Precalentar PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA "Todo"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA"Plataforma"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA "Config"
-#define MSG_PREHEAT_ABS "Precalentar ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS "Todo"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS "Plataforma"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS "Config"
+#define MSG_PREHEAT_1 "Precalentar PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 "Todo"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1"Plataforma"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 "Config"
+#define MSG_PREHEAT_2 "Precalentar ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 "Todo"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 "Plataforma"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 "Config"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h
index f87ac2f1c19439541ba3443877912ac5dce88423..ba8dfe4b367bbcca0ddcfa954687d8137d3b150a 100644
--- a/Marlin/language_eu.h
+++ b/Marlin/language_eu.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Hasiera ipini"
-#define MSG_PREHEAT_PLA "Aurreberotu PLA"
-#define MSG_PREHEAT_PLA_N "Aurreberotu PLA "
-#define MSG_PREHEAT_PLA_ALL "Berotu PLA Guztia"
-#define MSG_PREHEAT_PLA_BEDONLY "Berotu PLA Ohea"
-#define MSG_PREHEAT_PLA_SETTINGS "Berotu PLA Konfig"
-#define MSG_PREHEAT_ABS "Aurreberotu ABS"
-#define MSG_PREHEAT_ABS_N "Aurreberotu ABS "
-#define MSG_PREHEAT_ABS_ALL "Berotu ABS Guztia"
-#define MSG_PREHEAT_ABS_BEDONLY "Berotu ABS Ohea"
-#define MSG_PREHEAT_ABS_SETTINGS "Berotu ABS Konfig"
+#define MSG_PREHEAT_1 "Aurreberotu PLA"
+#define MSG_PREHEAT_1_N "Aurreberotu PLA "
+#define MSG_PREHEAT_1_ALL "Berotu PLA Guztia"
+#define MSG_PREHEAT_1_BEDONLY "Berotu PLA Ohea"
+#define MSG_PREHEAT_1_SETTINGS "Berotu PLA Konfig"
+#define MSG_PREHEAT_2 "Aurreberotu ABS"
+#define MSG_PREHEAT_2_N "Aurreberotu ABS "
+#define MSG_PREHEAT_2_ALL "Berotu ABS Guztia"
+#define MSG_PREHEAT_2_BEDONLY "Berotu ABS Ohea"
+#define MSG_PREHEAT_2_SETTINGS "Berotu ABS Konfig"
#define MSG_COOLDOWN "Hoztu"
#define MSG_SWITCH_PS_ON "Energia piztu"
#define MSG_SWITCH_PS_OFF "Energia itzali"
diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h
index be3db646c581f9c3c2e1ab0e9eefe68432174145..f3f4db27e806d304f778e747b06aa8590d9fd103 100644
--- a/Marlin/language_fi.h
+++ b/Marlin/language_fi.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Aseta origo"
-#define MSG_PREHEAT_PLA "Esilämmitä PLA"
-#define MSG_PREHEAT_PLA_N "Esilämmitä PLA "
-#define MSG_PREHEAT_PLA_ALL "Esilä. PLA Kaikki"
-#define MSG_PREHEAT_PLA_BEDONLY "Esilä. PLA Alusta"
-#define MSG_PREHEAT_PLA_SETTINGS "Esilämm. PLA konf"
-#define MSG_PREHEAT_ABS "Esilämmitä ABS"
-#define MSG_PREHEAT_ABS_N "Esilämmitä ABS "
-#define MSG_PREHEAT_ABS_ALL "Esilä. ABS Kaikki"
-#define MSG_PREHEAT_ABS_BEDONLY "Esilä. ABS Alusta"
-#define MSG_PREHEAT_ABS_SETTINGS "Esilämm. ABS konf"
+#define MSG_PREHEAT_1 "Esilämmitä PLA"
+#define MSG_PREHEAT_1_N "Esilämmitä PLA "
+#define MSG_PREHEAT_1_ALL "Esilä. PLA Kaikki"
+#define MSG_PREHEAT_1_BEDONLY "Esilä. PLA Alusta"
+#define MSG_PREHEAT_1_SETTINGS "Esilämm. PLA konf"
+#define MSG_PREHEAT_2 "Esilämmitä ABS"
+#define MSG_PREHEAT_2_N "Esilämmitä ABS "
+#define MSG_PREHEAT_2_ALL "Esilä. ABS Kaikki"
+#define MSG_PREHEAT_2_BEDONLY "Esilä. ABS Alusta"
+#define MSG_PREHEAT_2_SETTINGS "Esilämm. ABS konf"
#define MSG_COOLDOWN "Jäähdytä"
#define MSG_SWITCH_PS_ON "Virta päälle"
#define MSG_SWITCH_PS_OFF "Virta pois"
diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h
index f22abce00f3f6daacc44f3d5dbb1196d9f4d8be5..d56f778402bcb327dbb413de63f6393fa38a044d 100644
--- a/Marlin/language_fr.h
+++ b/Marlin/language_fr.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Regler decal. origine"
#define MSG_HOME_OFFSETS_APPLIED "Decalages appliques"
#define MSG_SET_ORIGIN "Regler origine"
-#define MSG_PREHEAT_PLA "Prechauffage PLA"
-#define MSG_PREHEAT_PLA_N "Prechauff. PLA "
-#define MSG_PREHEAT_PLA_ALL "Prech. PLA Tout"
-#define MSG_PREHEAT_PLA_BEDONLY "Prech. PLA Plateau"
-#define MSG_PREHEAT_PLA_SETTINGS "Regl. prech. PLA"
-#define MSG_PREHEAT_ABS "Prechauffage ABS"
-#define MSG_PREHEAT_ABS_N "Prechauff. ABS "
-#define MSG_PREHEAT_ABS_ALL "Prech. ABS Tout"
-#define MSG_PREHEAT_ABS_BEDONLY "Prech. ABS Plateau"
-#define MSG_PREHEAT_ABS_SETTINGS "Regl. prech. ABS"
+#define MSG_PREHEAT_1 "Prechauffage PLA"
+#define MSG_PREHEAT_1_N "Prechauff. PLA "
+#define MSG_PREHEAT_1_ALL "Prech. PLA Tout"
+#define MSG_PREHEAT_1_BEDONLY "Prech. PLA Plateau"
+#define MSG_PREHEAT_1_SETTINGS "Regl. prech. PLA"
+#define MSG_PREHEAT_2 "Prechauffage ABS"
+#define MSG_PREHEAT_2_N "Prechauff. ABS "
+#define MSG_PREHEAT_2_ALL "Prech. ABS Tout"
+#define MSG_PREHEAT_2_BEDONLY "Prech. ABS Plateau"
+#define MSG_PREHEAT_2_SETTINGS "Regl. prech. ABS"
#define MSG_COOLDOWN "Refroidir"
#define MSG_SWITCH_PS_ON "Allumer alim."
#define MSG_SWITCH_PS_OFF "Eteindre alim."
diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h
index f4e4639fc319657b85f741e29e4b9f95d3bd4df3..87453b81c86445f5613f83a93bdc33de6cb35921 100644
--- a/Marlin/language_gl.h
+++ b/Marlin/language_gl.h
@@ -54,16 +54,16 @@
#define MSG_SET_HOME_OFFSETS "Offsets na orixe"
#define MSG_HOME_OFFSETS_APPLIED "Offsets fixados"
#define MSG_SET_ORIGIN "Fixar orixe"
-#define MSG_PREHEAT_PLA "Prequentar PLA"
-#define MSG_PREHEAT_PLA_N "Prequentar PLA "
-#define MSG_PREHEAT_PLA_ALL "Preque. PLA Todo"
-#define MSG_PREHEAT_PLA_BEDONLY "Preque. PLA Cama"
-#define MSG_PREHEAT_PLA_SETTINGS "Preque. PLA conf"
-#define MSG_PREHEAT_ABS "Prequentar ABS"
-#define MSG_PREHEAT_ABS_N "Prequentar ABS "
-#define MSG_PREHEAT_ABS_ALL "Preque. ABS Todo"
-#define MSG_PREHEAT_ABS_BEDONLY "Preque. ABS Cama"
-#define MSG_PREHEAT_ABS_SETTINGS "Preque. ABS conf"
+#define MSG_PREHEAT_1 "Prequentar PLA"
+#define MSG_PREHEAT_1_N "Prequentar PLA "
+#define MSG_PREHEAT_1_ALL "Preque. PLA Todo"
+#define MSG_PREHEAT_1_BEDONLY "Preque. PLA Cama"
+#define MSG_PREHEAT_1_SETTINGS "Preque. PLA conf"
+#define MSG_PREHEAT_2 "Prequentar ABS"
+#define MSG_PREHEAT_2_N "Prequentar ABS "
+#define MSG_PREHEAT_2_ALL "Preque. ABS Todo"
+#define MSG_PREHEAT_2_BEDONLY "Preque. ABS Cama"
+#define MSG_PREHEAT_2_SETTINGS "Preque. ABS conf"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h
index d48e58ccb14bf188d2bf8d30a00eead0d0ccf296..5886115c68320b24770b4927b61a9427445c58fb 100644
--- a/Marlin/language_hr.h
+++ b/Marlin/language_hr.h
@@ -55,16 +55,16 @@
#define MSG_SET_HOME_OFFSETS "Postavi home offsete"
#define MSG_HOME_OFFSETS_APPLIED "Offsets postavljeni"
#define MSG_SET_ORIGIN "Postavi ishodište"
-#define MSG_PREHEAT_PLA "Predgrij PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Sve"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
-#define MSG_PREHEAT_ABS "Predgrij ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Sve"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
+#define MSG_PREHEAT_1 "Predgrij PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " Sve"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Bed"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " conf"
+#define MSG_PREHEAT_2 "Predgrij ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " Sve"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Bed"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " conf"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_it.h b/Marlin/language_it.h
index 481b725abf66fe9d427874f6ab2689c74b58845c..467a8780f031fb28a4bdb2a0ceef4079949ac426 100644
--- a/Marlin/language_it.h
+++ b/Marlin/language_it.h
@@ -54,16 +54,16 @@
#define MSG_SET_HOME_OFFSETS "Imp. offset home"
#define MSG_HOME_OFFSETS_APPLIED "Offset applicato"
#define MSG_SET_ORIGIN "Imposta Origine"
-#define MSG_PREHEAT_PLA "Preriscalda PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Tutto"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Piatto"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
-#define MSG_PREHEAT_ABS "Preriscalda ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Tutto"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Piatto"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
+#define MSG_PREHEAT_1 "Preriscalda PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " Tutto"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Piatto"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " conf"
+#define MSG_PREHEAT_2 "Preriscalda ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " Tutto"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Piatto"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " conf"
#define MSG_COOLDOWN "Raffredda"
#define MSG_SWITCH_PS_ON "Accendi aliment."
#define MSG_SWITCH_PS_OFF "Spegni aliment."
diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h
index 7eb6f592a5d4bd27827ea392e35115170fcdb4bf..196f57f62fb36d6c2a555e42604199ac960f0a9d 100644
--- a/Marlin/language_kana.h
+++ b/Marlin/language_kana.h
@@ -56,16 +56,16 @@
#define MSG_SET_HOME_OFFSETS "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2" // "ｷｼﾞｭﾝｵﾌｾｯﾄｾｯﾃｲ" ("Set home offsets")
#define MSG_HOME_OFFSETS_APPLIED "\xb5\xcc\xbe\xaf\xc4\xb6\xde\xc3\xb7\xd6\xb3\xbb\xda\xcf\xbc\xc0" // "ｵﾌｾｯﾄｶﾞﾃｷﾖｳｻﾚﾏｼﾀ" ("Offsets applied")
#define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "ｷｼﾞｭﾝｾｯﾄ" ("Set origin")
-#define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2" // "PLA ﾖﾈﾂ" ("Preheat PLA")
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
-#define MSG_PREHEAT_ABS "ABS \xd6\xc8\xc2" // "ABS ﾖﾈﾂ" ("Preheat ABS")
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
+#define MSG_PREHEAT_1 "PLA \xd6\xc8\xc2" // "PLA ﾖﾈﾂ" ("Preheat PLA")
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
+#define MSG_PREHEAT_2 "ABS \xd6\xc8\xc2" // "ABS ﾖﾈﾂ" ("Preheat ABS")
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
#define MSG_COOLDOWN "\xb6\xc8\xc2\xc3\xb2\xbc" // "ｶﾈﾂﾃｲｼ" ("Cooldown")
#define MSG_SWITCH_PS_ON "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xdd" // "ﾃﾞﾝｹﾞﾝ ｵﾝ" ("Switch power on")
#define MSG_SWITCH_PS_OFF "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc" // "ﾃﾞﾝｹﾞﾝ ｵﾌ" ("Switch power off")
diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h
index 8a35e7cef8e1aa049c65e257bd1682ebe0c15d5c..b9121260708bb73876536d409ba66c79a7be64fb 100644
--- a/Marlin/language_kana_utf8.h
+++ b/Marlin/language_kana_utf8.h
@@ -59,16 +59,16 @@
#define MSG_SET_HOME_OFFSETS "キジュンオフセットセッテイ" // "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "オフセットガテキヨウサレマシタ" // "Offsets applied"
#define MSG_SET_ORIGIN "キジュンセット" // "Set origin"
-#define MSG_PREHEAT_PLA "PLA ヨネツ" // "Preheat PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " スベテ" // " All"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " ベッド" // " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " セッテイ" // " conf"
-#define MSG_PREHEAT_ABS "ABS ヨネツ" // "Preheat ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " スベテ" // " All"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " ベッド" // " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " セッテイ" // " conf"
+#define MSG_PREHEAT_1 "PLA ヨネツ" // "Preheat PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " スベテ" // " All"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " ベッド" // " Bed"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " セッテイ" // " conf"
+#define MSG_PREHEAT_2 "ABS ヨネツ" // "Preheat ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " スベテ" // " All"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " ベッド" // " Bed"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " セッテイ" // " conf"
#define MSG_COOLDOWN "カネツテイシ" // "Cooldown"
#define MSG_SWITCH_PS_ON "デンゲン オン" // "Switch power on"
#define MSG_SWITCH_PS_OFF "デンゲン オフ" // "Switch power off"
diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h
index c74ad8fbd76f9cbf4373ce2b8f15988990a12feb..d291ae6aa99a6937cea79686cbaf903b9b6ff1ab 100644
--- a/Marlin/language_nl.h
+++ b/Marlin/language_nl.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Zet home offsets"
#define MSG_HOME_OFFSETS_APPLIED "H offset toegep."
#define MSG_SET_ORIGIN "Nulpunt instellen"
-#define MSG_PREHEAT_PLA "PLA voorverwarmen"
-#define MSG_PREHEAT_PLA_N "PLA voorverw. "
-#define MSG_PREHEAT_PLA_ALL "PLA voorverw. aan"
-#define MSG_PREHEAT_PLA_BEDONLY "PLA voorverw. Bed"
-#define MSG_PREHEAT_PLA_SETTINGS "PLA verw. conf"
-#define MSG_PREHEAT_ABS "ABS voorverwarmen"
-#define MSG_PREHEAT_ABS_N "ABS voorverw. "
-#define MSG_PREHEAT_ABS_ALL "ABS voorverw. aan"
-#define MSG_PREHEAT_ABS_BEDONLY "ABS voorverw. Bed"
-#define MSG_PREHEAT_ABS_SETTINGS "ABS verw. conf"
+#define MSG_PREHEAT_1 "PLA voorverwarmen"
+#define MSG_PREHEAT_1_N "PLA voorverw. "
+#define MSG_PREHEAT_1_ALL "PLA voorverw. aan"
+#define MSG_PREHEAT_1_BEDONLY "PLA voorverw. Bed"
+#define MSG_PREHEAT_1_SETTINGS "PLA verw. conf"
+#define MSG_PREHEAT_2 "ABS voorverwarmen"
+#define MSG_PREHEAT_2_N "ABS voorverw. "
+#define MSG_PREHEAT_2_ALL "ABS voorverw. aan"
+#define MSG_PREHEAT_2_BEDONLY "ABS voorverw. Bed"
+#define MSG_PREHEAT_2_SETTINGS "ABS verw. conf"
#define MSG_COOLDOWN "Afkoelen"
#define MSG_SWITCH_PS_ON "Stroom aan"
#define MSG_SWITCH_PS_OFF "Stroom uit"
diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h
index 9c38a6db51f3089e8b110e31333e669054fd2df8..3b5da73c656d9b5f695dd2feb036dc8157eee84f 100644
--- a/Marlin/language_pl.h
+++ b/Marlin/language_pl.h
@@ -51,16 +51,16 @@
#define MSG_SET_HOME_OFFSETS "Ust. poz. zer."
#define MSG_HOME_OFFSETS_APPLIED "Poz. zerowa ust."
#define MSG_SET_ORIGIN "Ustaw punkt zero"
-#define MSG_PREHEAT_PLA "Rozgrzej PLA"
-#define MSG_PREHEAT_PLA_N "Rozgrzej PLA "
-#define MSG_PREHEAT_PLA_ALL "Roz. PLA Wszystko"
-#define MSG_PREHEAT_PLA_BEDONLY "Rozgrzej PLA Loze"
-#define MSG_PREHEAT_PLA_SETTINGS "Ustaw. rozg. PLA"
-#define MSG_PREHEAT_ABS "Rozgrzej ABS"
-#define MSG_PREHEAT_ABS_N "Rozgrzej ABS "
-#define MSG_PREHEAT_ABS_ALL "Roz. ABS Wszystko"
-#define MSG_PREHEAT_ABS_BEDONLY "Rozgrzej ABS Loze"
-#define MSG_PREHEAT_ABS_SETTINGS "Ustaw. rozg. ABS"
+#define MSG_PREHEAT_1 "Rozgrzej PLA"
+#define MSG_PREHEAT_1_N "Rozgrzej PLA "
+#define MSG_PREHEAT_1_ALL "Roz. PLA Wszystko"
+#define MSG_PREHEAT_1_BEDONLY "Rozgrzej PLA Loze"
+#define MSG_PREHEAT_1_SETTINGS "Ustaw. rozg. PLA"
+#define MSG_PREHEAT_2 "Rozgrzej ABS"
+#define MSG_PREHEAT_2_N "Rozgrzej ABS "
+#define MSG_PREHEAT_2_ALL "Roz. ABS Wszystko"
+#define MSG_PREHEAT_2_BEDONLY "Rozgrzej ABS Loze"
+#define MSG_PREHEAT_2_SETTINGS "Ustaw. rozg. ABS"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h
index cc37f31dae9138b66fdd439cc568e12a2ea7b2a7..c83f0dd2c7d51f19486e5d61a0c7042a760a2025 100644
--- a/Marlin/language_pt-br.h
+++ b/Marlin/language_pt-br.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Ajustar orig."
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq.Todo PLA"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Ajustar PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_ALL "Pre-aq.Todo ABS"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Ajustar ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq.Todo PLA"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Ajustar PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_ALL "Pre-aq.Todo ABS"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Ajustar ABS"
#define MSG_COOLDOWN "Esfriar"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h
index feb38b49685115cf2bba94949aafd51860ee9ea7..41aa467564b2988967ab9394f3a0e242a4f70ca1 100644
--- a/Marlin/language_pt-br_utf8.h
+++ b/Marlin/language_pt-br_utf8.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Ajustar orig."
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq.Todo PLA"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Ajustar PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_ALL "Pre-aq.Todo ABS"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Ajustar ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq.Todo PLA"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Ajustar PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_ALL "Pre-aq.Todo ABS"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Ajustar ABS"
#define MSG_COOLDOWN "Esfriar"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h
index 4c857a7c1dae1186b347ef47469fb9e567c98789..574e7fe63f2908bd09b647b3de719e557cdd9cc1 100644
--- a/Marlin/language_pt.h
+++ b/Marlin/language_pt.h
@@ -53,16 +53,16 @@
#define MSG_SET_HOME_OFFSETS "Definir desvio"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Definir origem"
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq. PLA Tudo"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Definicoes PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS "
-#define MSG_PREHEAT_ABS_ALL "Pre-aq. ABS Tudo"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Definicoes ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq. PLA Tudo"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Definicoes PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS "
+#define MSG_PREHEAT_2_ALL "Pre-aq. ABS Tudo"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Definicoes ABS"
#define MSG_COOLDOWN "Arrefecer"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h
index c2fab4d63677a3e3f72a47a8517543114156ae4a..25c4ddc5f877fe6a5d27e97ae1aefeaaf6685f40 100644
--- a/Marlin/language_pt_utf8.h
+++ b/Marlin/language_pt_utf8.h
@@ -53,16 +53,16 @@
#define MSG_SET_HOME_OFFSETS "Definir desvio"
#define MSG_HOME_OFFSETS_APPLIED "Offsets aplicados"
#define MSG_SET_ORIGIN "Definir origem"
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq. PLA Tudo"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Definições PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS "
-#define MSG_PREHEAT_ABS_ALL "Pre-aq. ABS Tudo"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Definições ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq. PLA Tudo"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Definições PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS "
+#define MSG_PREHEAT_2_ALL "Pre-aq. ABS Tudo"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Definições ABS"
#define MSG_COOLDOWN "Arrefecer"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h
index 4d0f976c90373c5a84853d4a1d22859b4b854fbe..c86e349833842a3ff54a30d2425a7ae7914c4578 100644
--- a/Marlin/language_ru.h
+++ b/Marlin/language_ru.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Запомнить парковку"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Запомнить ноль"
-#define MSG_PREHEAT_PLA "Преднагрев PLA"
-#define MSG_PREHEAT_PLA_N "Греть PLA Сопло "
-#define MSG_PREHEAT_PLA_ALL "Греть PLA Все"
-#define MSG_PREHEAT_PLA_BEDONLY "Греть PLA Стол"
-#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
-#define MSG_PREHEAT_ABS "Преднагрев ABS"
-#define MSG_PREHEAT_ABS_N "Греть ABS Сопло "
-#define MSG_PREHEAT_ABS_ALL "Греть ABS Все"
-#define MSG_PREHEAT_ABS_BEDONLY "Греть ABS Стол"
-#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
+#define MSG_PREHEAT_1 "Преднагрев PLA"
+#define MSG_PREHEAT_1_N "Греть PLA Сопло "
+#define MSG_PREHEAT_1_ALL "Греть PLA Все"
+#define MSG_PREHEAT_1_BEDONLY "Греть PLA Стол"
+#define MSG_PREHEAT_1_SETTINGS "Настройки PLA"
+#define MSG_PREHEAT_2 "Преднагрев ABS"
+#define MSG_PREHEAT_2_N "Греть ABS Сопло "
+#define MSG_PREHEAT_2_ALL "Греть ABS Все"
+#define MSG_PREHEAT_2_BEDONLY "Греть ABS Стол"
+#define MSG_PREHEAT_2_SETTINGS "Настройки ABS"
#define MSG_COOLDOWN "Охлаждение"
#define MSG_SWITCH_PS_ON "Включить Питание"
#define MSG_SWITCH_PS_OFF "Отключить Питание"
diff --git a/Marlin/language_test.h b/Marlin/language_test.h
index 17ad7bca0c1cf6e810bba539fff5bd084f4b43d7..ad284d2f7a2fc2b5c6af5ec5d1c4a50a766fbe4e 100644
--- a/Marlin/language_test.h
+++ b/Marlin/language_test.h
@@ -141,8 +141,8 @@
#define MSG_DISABLE_STEPPERS STRG_C2_8
#define MSG_AUTO_HOME STRG_C2_9
#define MSG_SET_HOME_OFFSETS STRG_C2_a
- #define MSG_PREHEAT_PLA STRG_C2_b
- #define MSG_PREHEAT_ABS STRG_C3_8
+ #define MSG_PREHEAT_1 STRG_C2_b
+ #define MSG_PREHEAT_2 STRG_C3_8
#define MSG_COOLDOWN STRG_C3_9
#define MSG_SWITCH_PS_OFF STRG_C3_a
#define MSG_MOVE_AXIS STRG_C3_b
@@ -176,8 +176,8 @@
#define MSG_DISABLE_STEPPERS STRG_D0_8
#define MSG_AUTO_HOME STRG_D0_9
#define MSG_SET_HOME_OFFSETS STRG_D0_a
- #define MSG_PREHEAT_PLA STRG_D0_b
- #define MSG_PREHEAT_ABS STRG_D1_8
+ #define MSG_PREHEAT_1 STRG_D0_b
+ #define MSG_PREHEAT_2 STRG_D1_8
#define MSG_COOLDOWN STRG_D1_9
#define MSG_SWITCH_PS_OFF STRG_D1_a
#define MSG_MOVE_AXIS STRG_D1_b
@@ -211,8 +211,8 @@
#define MSG_DISABLE_STEPPERS STRG_E382_8
#define MSG_AUTO_HOME STRG_E382_9
#define MSG_SET_HOME_OFFSETS STRG_E382_a
- #define MSG_PREHEAT_PLA STRG_E382_b
- #define MSG_PREHEAT_ABS STRG_E383_8
+ #define MSG_PREHEAT_1 STRG_E382_b
+ #define MSG_PREHEAT_2 STRG_E383_8
#define MSG_COOLDOWN STRG_E383_9
#define MSG_SWITCH_PS_OFF STRG_E383_a
#define MSG_MOVE_AXIS STRG_E383_b
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 87104d87ecf154307aa68a51c54b949cd7657557..7536ec9af487fd8971d3ab43620d85d1bdd19235 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -33,13 +33,8 @@
#include "printcounter.h"
#endif
-int plaPreheatHotendTemp;
-int plaPreheatHPBTemp;
-int plaPreheatFanSpeed;
-
-int absPreheatHotendTemp;
-int absPreheatHPBTemp;
-int absPreheatFanSpeed;
+int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
+ preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
#if ENABLED(FILAMENT_LCD_DISPLAY)
millis_t previous_lcd_status_ms = 0;
@@ -849,29 +844,29 @@ static void lcd_status_screen() {
}
#if TEMP_SENSOR_0 != 0
- void lcd_preheat_pla0() { _lcd_preheat(0, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs0() { _lcd_preheat(0, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla0() { _lcd_preheat(0, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs0() { _lcd_preheat(0, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#endif
#if HOTENDS > 1
- void lcd_preheat_pla1() { _lcd_preheat(1, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs1() { _lcd_preheat(1, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla1() { _lcd_preheat(1, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs1() { _lcd_preheat(1, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#if HOTENDS > 2
- void lcd_preheat_pla2() { _lcd_preheat(2, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs2() { _lcd_preheat(2, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla2() { _lcd_preheat(2, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs2() { _lcd_preheat(2, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#if HOTENDS > 3
- void lcd_preheat_pla3() { _lcd_preheat(3, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs3() { _lcd_preheat(3, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla3() { _lcd_preheat(3, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs3() { _lcd_preheat(3, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#endif
#endif
void lcd_preheat_pla0123() {
#if HOTENDS > 1
- thermalManager.setTargetHotend(plaPreheatHotendTemp, 1);
+ thermalManager.setTargetHotend(preheatHotendTemp1, 1);
#if HOTENDS > 2
- thermalManager.setTargetHotend(plaPreheatHotendTemp, 2);
+ thermalManager.setTargetHotend(preheatHotendTemp1, 2);
#if HOTENDS > 3
- thermalManager.setTargetHotend(plaPreheatHotendTemp, 3);
+ thermalManager.setTargetHotend(preheatHotendTemp1, 3);
#endif
#endif
#endif
@@ -879,11 +874,11 @@ static void lcd_status_screen() {
}
void lcd_preheat_abs0123() {
#if HOTENDS > 1
- thermalManager.setTargetHotend(absPreheatHotendTemp, 1);
+ thermalManager.setTargetHotend(preheatHotendTemp2, 1);
#if HOTENDS > 2
- thermalManager.setTargetHotend(absPreheatHotendTemp, 2);
+ thermalManager.setTargetHotend(preheatHotendTemp2, 2);
#if HOTENDS > 3
- thermalManager.setTargetHotend(absPreheatHotendTemp, 3);
+ thermalManager.setTargetHotend(preheatHotendTemp2, 3);
#endif
#endif
#endif
@@ -893,8 +888,8 @@ static void lcd_status_screen() {
#endif // HOTENDS > 1
#if TEMP_SENSOR_BED != 0
- void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, preheatBedTemp2, preheatFanSpeed2); }
#endif
#if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
@@ -903,20 +898,20 @@ static void lcd_status_screen() {
START_MENU();
MENU_ITEM(back, MSG_PREPARE);
#if HOTENDS == 1
- MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
+ MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
#else
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H1, lcd_preheat_pla0);
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H2, lcd_preheat_pla1);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_pla0);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_pla1);
#if HOTENDS > 2
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H3, lcd_preheat_pla2);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_pla2);
#if HOTENDS > 3
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H4, lcd_preheat_pla3);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_pla3);
#endif
#endif
- MENU_ITEM(function, MSG_PREHEAT_PLA_ALL, lcd_preheat_pla0123);
+ MENU_ITEM(function, MSG_PREHEAT_1_ALL, lcd_preheat_pla0123);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
+ MENU_ITEM(function, MSG_PREHEAT_1_BEDONLY, lcd_preheat_pla_bedonly);
#endif
END_MENU();
}
@@ -925,20 +920,20 @@ static void lcd_status_screen() {
START_MENU();
MENU_ITEM(back, MSG_PREPARE);
#if HOTENDS == 1
- MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
+ MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
#else
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H1, lcd_preheat_abs0);
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H2, lcd_preheat_abs1);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_abs0);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_abs1);
#if HOTENDS > 2
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H3, lcd_preheat_abs2);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_abs2);
#if HOTENDS > 3
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H4, lcd_preheat_abs3);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_abs3);
#endif
#endif
- MENU_ITEM(function, MSG_PREHEAT_ABS_ALL, lcd_preheat_abs0123);
+ MENU_ITEM(function, MSG_PREHEAT_2_ALL, lcd_preheat_abs0123);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM(function, MSG_PREHEAT_ABS_BEDONLY, lcd_preheat_abs_bedonly);
+ MENU_ITEM(function, MSG_PREHEAT_2_BEDONLY, lcd_preheat_abs_bedonly);
#endif
END_MENU();
}
@@ -1222,11 +1217,11 @@ static void lcd_status_screen() {
//
#if TEMP_SENSOR_0 != 0
#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
- MENU_ITEM(submenu, MSG_PREHEAT_PLA, lcd_preheat_pla_menu);
- MENU_ITEM(submenu, MSG_PREHEAT_ABS, lcd_preheat_abs_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_pla_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_abs_menu);
#else
- MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
- MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
+ MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
+ MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
#endif
#endif
@@ -1685,12 +1680,12 @@ static void lcd_status_screen() {
//
// Preheat PLA conf
//
- MENU_ITEM(submenu, MSG_PREHEAT_PLA_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_1_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
//
// Preheat ABS conf
//
- MENU_ITEM(submenu, MSG_PREHEAT_ABS_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_2_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
END_MENU();
}
@@ -1702,12 +1697,12 @@ static void lcd_status_screen() {
static void lcd_control_temperature_preheat_pla_settings_menu() {
START_MENU();
MENU_ITEM(back, MSG_TEMPERATURE);
- MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &plaPreheatFanSpeed, 0, 255);
+ MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &preheatFanSpeed1, 0, 255);
#if TEMP_SENSOR_0 != 0
- MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_NOZZLE, &preheatHotendTemp1, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_BED, &preheatBedTemp1, BED_MINTEMP, BED_MAXTEMP - 15);
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
@@ -1723,12 +1718,12 @@ static void lcd_status_screen() {
static void lcd_control_temperature_preheat_abs_settings_menu() {
START_MENU();
MENU_ITEM(back, MSG_TEMPERATURE);
- MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &absPreheatFanSpeed, 0, 255);
+ MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &preheatFanSpeed2, 0, 255);
#if TEMP_SENSOR_0 != 0
- MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_NOZZLE, &preheatHotendTemp2, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_BED, &preheatBedTemp2, BED_MINTEMP, BED_MAXTEMP - 15);
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index 40b09606ae272c8d516417e8314aef275d732392..bf5e230fa09c03c43d4a68565ea4d05bf990b45c 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -88,12 +88,12 @@
FORCE_INLINE void lcd_buttons_update() {}
#endif
- extern int plaPreheatHotendTemp;
- extern int plaPreheatHPBTemp;
- extern int plaPreheatFanSpeed;
- extern int absPreheatHotendTemp;
- extern int absPreheatHPBTemp;
- extern int absPreheatFanSpeed;
+ extern int preheatHotendTemp1;
+ extern int preheatBedTemp1;
+ extern int preheatFanSpeed1;
+ extern int preheatHotendTemp2;
+ extern int preheatBedTemp2;
+ extern int preheatFanSpeed2;
#if ENABLED(FILAMENT_LCD_DISPLAY)
extern millis_t previous_lcd_status_ms;